svn commit: trunk/busybox/testsuite

landley at busybox.net landley at busybox.net
Thu Jun 15 20:07:58 UTC 2006


Author: landley
Date: 2006-06-15 13:07:57 -0700 (Thu, 15 Jun 2006)
New Revision: 15396

Log:
Don't do workarounds for broken shells.  Busybox is about to grow a shell that
we can run our own testsuite under, and I want it to handle the full range of
strange and peverted behavior you can find in real world shell scripts.
In the meantime, I'll just say #!/bin/bash in places that may care.


Modified:
   trunk/busybox/testsuite/testing.sh


Changeset:
Modified: trunk/busybox/testsuite/testing.sh
===================================================================
--- trunk/busybox/testsuite/testing.sh	2006-06-15 17:34:57 UTC (rev 15395)
+++ trunk/busybox/testsuite/testing.sh	2006-06-15 20:07:57 UTC (rev 15396)
@@ -37,7 +37,7 @@
 
 # Helper functions
 
-optional ()
+optional()
 {
   option=`echo "$OPTIONFLAGS" | egrep "(^|:)$1(:|\$)"`
   # Not set?
@@ -55,7 +55,6 @@
 {
   NAME="$1"
   [ -z "$1" ] && NAME=$2
-  ret=0
 
   if [ $# -ne 5 ]
   then
@@ -77,15 +76,12 @@
   echo -ne "$5" | eval "$2" > actual
   RETVAL=$?
 
-  cmp expected actual > /dev/null || ret=$?
-  if [ $ret -ne 0 ]
+  cmp expected actual > /dev/null 
+  if [ $? -ne 0 ]
   then
     FAILCOUNT=$[$FAILCOUNT+1]
     echo "FAIL: $NAME"
-    if [ -n "$VERBOSE" ]
-    then
-      diff -u expected actual || /bin/true
-    fi
+    [ -n "$VERBOSE" ] && diff -u expected actual
   else
     echo "PASS: $NAME"
   fi
@@ -101,7 +97,7 @@
 # the file is assumed to already be there and only its library dependencies
 # are copied.
 
-mkchroot ()
+function mkchroot
 {
   [ $# -lt 2 ] && return
 
@@ -130,7 +126,7 @@
 # Needed commands listed on command line
 # Script fed to stdin.
 
-dochroot ()
+function dochroot
 {
   mkdir tmpdir4chroot
   mount -t ramfs tmpdir4chroot tmpdir4chroot




More information about the busybox-cvs mailing list