cd82c3c04
Rob Landley
2006-06-15
Subject
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.
SOURCE BUG
This commit was genuinely broken at the time (not related to our build system): scripts/config/mkconfigs.c (2005-08-01 - 2006-10-05 arasi) uretilen bbconfigopts.h icine .config satirlarini kacissiz, ham newline'larla gömüyordu - gecerli C degildi, busybox'un kendi bb_mkdep araci bile parse edemiyordu (7d219aab7 ile duzeltildi, mkconfigs shell scripte cevrildi)
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
testsuite/testing.sh+6 -10
| @@ -37,7 +37,7 @@ export SKIP= | |
| # Helper functions | |
| - | optional () |
| + | optional() |
| { | |
| option=`echo "$OPTIONFLAGS" | egrep "(^|:)$1(:|\$)"` | |
| # Not set? | |
| @@ -55,7 +55,6 @@ testing () | |
| { | |
| NAME="$1" | |
| [ -z "$1" ] && NAME=$2 | |
| - | ret=0 |
| if [ $# -ne 5 ] | |
| then | |
| @@ -77,15 +76,12 @@ testing () | |
| 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 @@ testing () | |
| # 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 @@ mkchroot () | |
| # Needed commands listed on command line | |
| # Script fed to stdin. | |
| - | dochroot () |
| + | function dochroot |
| { | |
| mkdir tmpdir4chroot | |
| mount -t ramfs tmpdir4chroot tmpdir4chroot | |