[Opensync-commits] r200 - wbxmlTestSuite/trunk

[<svn...@op...>]

Author: bellmich
Date: Tue Mar 31 16:34:35 2009
New Revision: 200
URL: http://libwbxml.opensync.org/changeset/200

Log:
removed bashisms

Modified:
   wbxmlTestSuite/trunk/launchTests.sh

Modified: wbxmlTestSuite/trunk/launchTests.sh
==============================================================================
--- wbxmlTestSuite/trunk/launchTests.sh	Tue Mar 31 16:31:54 2009	(r199)
+++ wbxmlTestSuite/trunk/launchTests.sh	Tue Mar 31 16:34:35 2009	(r200)
@@ -57,9 +57,10 @@
 	TEST_SUITE_DIR=`dirname $0`
 fi
 
-cd "$TEST_SUITE_DIR"
+cd "$TEST_SUITE_DIR" || exit 1
+PWD=`pwd`
 
-echo Test suite directory is `pwd`
+echo Test suite directory is $PWD
 
 # Create temporary directory
 TMP_DIR=`mktemp -d -t LibWBXMLTestSuite.XXX`
@@ -67,10 +68,10 @@
 # execute only a special test directory
 if [ " $2" != " " ]
 then
-	DIRLIST=$(find `pwd` -maxdepth 1 -type d -name $2 -print | sort)
+	DIRLIST=`find $PWD/. \( -type d -a -name $2 -a ! -name . -prune \) -print | sort`
 	if [ ! "$DIRLIST" ]
 	then
-		DIRLIST=$(find `pwd` -maxdepth 1 -type d ! -name "*svn*" -print | sort)
+		DIRLIST=`find $PWD/. \( -type d -a ! -name "*svn*" -a ! -name . -prune \) -print | sort`
 		COUNTER=0
 		for ITEM in $DIRLIST
 		do
@@ -83,7 +84,7 @@
 		DIRLIST=$RESULT
 	fi
 else
-	DIRLIST=$(find `pwd` -maxdepth 1 -type d ! -name "*svn*" -print | sort)
+	DIRLIST=`find $PWD/. \( -type d -a ! -name "*svn*" -a ! -name . -prune \) -print | sort`
 fi
 
 # For each directory
@@ -98,16 +99,16 @@
 
   # execute only a special test in a directory
   if [ `basename $i` != 'ddf' ]; then
-  	TESTLIST=$(find $i -maxdepth 1 -type f -name "*.xml" -print | sort )
+  	TESTLIST=`find $i/. \( -type f -name "*.xml" -a ! -name . -prune \) -print | sort`
   else
-  	TESTLIST=$(find $i -maxdepth 1 -type f \( -name "*.ddf" -or -name "*.xml" \) -print | sort )
+  	TESTLIST=`find $i/. \( -type f \( -name "*.ddf" -or -name "*.xml" \) -a ! -name . -prune \) -print | sort`
   fi
   if [ " $3" != " " ]
   then
 	COUNTER=0
 	for ITEM in $TESTLIST
 	do
-		COUNTER=$(($COUNTER + 1))
+		COUNTER=`expr $COUNTER + 1`
 		if [ "$COUNTER" -eq "$3" ]
 		then
 			TESTCASE=$ITEM