diff options
| author | Alex Xu (Hello71) <alex_y_xu@yahoo.ca> | 2021-08-07 08:33:23 -0400 |
|---|---|---|
| committer | Timo Teräs <timo.teras@iki.fi> | 2021-09-03 15:02:12 +0300 |
| commit | a278d112877a0c347e42694d399d62ebbafc1dee (patch) | |
| tree | 648f47404798ad3311b98b840d0647e518fdb66e | |
| parent | 984cd3e0b60d744e0b887ba2340c78b85eb991eb (diff) | |
| download | apk-tools-a278d112877a0c347e42694d399d62ebbafc1dee.tar.gz apk-tools-a278d112877a0c347e42694d399d62ebbafc1dee.tar.bz2 apk-tools-a278d112877a0c347e42694d399d62ebbafc1dee.tar.xz apk-tools-a278d112877a0c347e42694d399d62ebbafc1dee.zip | |
test: improve posix sh compatibility
| -rw-r--r-- | test/Makefile | 4 | ||||
| -rwxr-xr-x | test/solver.sh | 4 | ||||
| -rwxr-xr-x | test/version.sh | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/test/Makefile b/test/Makefile index 9834668..a48387d 100644 --- a/test/Makefile +++ b/test/Makefile @@ -50,9 +50,9 @@ repos.stamp: $(repos) fi; \ if ! APK="$(APK)" ROOT="$(testroot)" SYSREPO="$(SYSREPO)" sh -ex ./$< > $(basename $@).out 2>&1; then\ echo " FAIL";\ - printf "------------- output -------------\n" >&2;\ + printf '%s\n' "------------- output -------------" >&2;\ cat $(basename $@).out >&2;\ - printf "----------------------------------\n" >&2;\ + printf '%s\n' "----------------------------------" >&2;\ exit 1;\ fi ;\ echo " OK" ;\ diff --git a/test/solver.sh b/test/solver.sh index d14d89d..4c9f50d 100755 --- a/test/solver.sh +++ b/test/solver.sh @@ -10,9 +10,9 @@ TEST_TO_RUN="$@" fail=0 pass=0 for test in ${TEST_TO_RUN:-*.test}; do - get_block ARGS < $test | xargs $APK_TEST &> .$test.got + get_block ARGS < $test | xargs $APK_TEST > .$test.got 2>&1 - if ! get_block EXPECT < $test | cmp .$test.got &> /dev/null; then + if ! get_block EXPECT < $test | cmp .$test.got > /dev/null 2>&1; then fail=$((fail+1)) echo "FAIL: $test" get_block EXPECT < $test | diff -ru - .$test.got diff --git a/test/version.sh b/test/version.sh index 18199a6..628a6eb 100755 --- a/test/version.sh +++ b/test/version.sh @@ -9,7 +9,7 @@ cat version.data | while read a result b rest ; do fi done -if [ "$fail" == "0" ]; then +if [ "$fail" = "0" ]; then echo "OK: version checking works" fi |