Fixup header file ordering

[oweals/busybox.git] / tests / tester.sh

diff --git a/tests/tester.sh b/tests/tester.sh
index a4fa38d348ee5c2f313b05da3fe40c4869079b7f..09ba750ece3700284397b8d3eed533317672c9a8 100755 (executable)
--- a/tests/tester.sh
+++ b/tests/tester.sh
@@ -10,7 +10,7 @@
 BUSYBOX=../busybox
 TESTCASES=testcases
 LOGFILE=tester.log
-BB_OUT=bb.out
+CONFIG_OUT=bb.out
 GNU_OUT=gnu.out
 SETUP=""
 CLEANUP=""
@@ -25,7 +25,7 @@ do
                p) BUSYBOX=$OPTARG; ;;
                t) TESTCASES=$OPTARG; ;;
                l) LOGFILE=$OPTARG; ;;
-#              b) BB_OUT=$OPTARG; ;;
+#              b) CONFIG_OUT=$OPTARG; ;;
 #              g) GNU_OUT=$OPTARG; ;;
                s) SETUP=$OPTARG; ;;
                c) CLEANUP=$OPTARG; ;;
@@ -59,7 +59,7 @@ then
        echo "BUSYBOX=$BUSYBOX"
        echo "TESTCASES=$TESTCASES"
        echo "LOGFILE=$LOGFILE"
-       echo "BB_OUT=$BB_OUT"
+       echo "CONFIG_OUT=$CONFIG_OUT"
        echo "GNU_OUT=$GNU_OUT"
        echo "SETUP=$SETUP"
        echo "CLEANUP=$CLEANUP"
@@ -87,7 +87,7 @@ unalias -a    # gets rid of aliases that might create different output
 
 
 # do extra setup (if any)
-if [ ! -z $SETUP ] 
+if [ ! -z "$SETUP" ] 
 then
        [ $DEBUG -ge 2 ] && echo "running setup commands in $SETUP"
        source $SETUP
@@ -120,19 +120,23 @@ do
 
                                # change line to include "busybox" before every statement
                                line="$BUSYBOX $line"
-                               line=${line//;/; $BUSYBOX }
-                               line=${line//|/| $BUSYBOX }
+                               # is this a bash-2-ism?
+                               # line=${line//;/; $BUSYBOX }
+                               # line=${line//|/| $BUSYBOX }
+                               # assume $BUSYBOX has no commas
+                               line=`echo "$line" | sed -e 's,;,; '$BUSYBOX, \
+                                                      -e 's, |, | '$BUSYBOX,`
 
                                # execute line using busybox programs
                                [ $DEBUG -ge 2 ] && echo "testing: $line" | tee -a $LOGFILE
-                               sh -c "$line" > $BB_OUT
+                               sh -c "$line" > $CONFIG_OUT
 
                                # see if they match
-                               diff -q $BB_OUT $GNU_OUT > /dev/null
+                               diff -q $CONFIG_OUT $GNU_OUT > /dev/null
                                if [ $? -eq 1 ]
                                then
                                        [ $DEBUG -ge 1 ] && echo "FAILED: $line" | tee -a $LOGFILE
-                                       diff -u $BB_OUT $GNU_OUT >> $LOGFILE 
+                                       diff -u $CONFIG_OUT $GNU_OUT >> $LOGFILE 
                                fi
                        fi
                fi
@@ -143,11 +147,11 @@ done
 
 
 # do normal cleanup
-[ $KEEPTMPFILES == "no" ] && rm -f $BB_OUT $GNU_OUT
+[ "$KEEPTMPFILES" = "no" ] && rm -f $CONFIG_OUT $GNU_OUT
 
 
 # do extra cleanup (if any)
-if [ ! -z $CLEANUP ] 
+if [ ! -z "$CLEANUP" ] 
 then
        [ $DEBUG -ge 2 ] && echo "running cleanup commands in $CLEANUP"
        source $CLEANUP