diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-03-03 15:50:02 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-03-03 15:50:02 +0000 |
| commit | f7dea2434e4123d2f864e444e642e4cc87880db4 (patch) | |
| tree | 4dc72a4a153486d86e427ac07b3eeb38b47e3eb3 | |
| parent | 66bc8fa438fb48c6625f26f27e8884e3aaf9c82f (diff) | |
| parent | ad17340170b39945afd484582ad29e40deeb7112 (diff) | |
| download | toybox-f7dea2434e4123d2f864e444e642e4cc87880db4.tar.gz | |
Stop ignoring chattr test failures. am: ad17340170
Change-Id: I08b5e4974042a608c9806284cd2783f3f536731d
| -rwxr-xr-x | run-tests-on-android.sh | 7 | ||||
| -rwxr-xr-x | tests/sh.test | 2 |
2 files changed, 2 insertions, 7 deletions
diff --git a/run-tests-on-android.sh b/run-tests-on-android.sh index 744fc8b4..d85cca31 100755 --- a/run-tests-on-android.sh +++ b/run-tests-on-android.sh @@ -62,12 +62,7 @@ test_toy() { elif [ "$non_toy" = "true" ]; then non_toy_failures="$non_toy_failures $toy" else - # The chattr tests are currently broken on cuttlefish. Working on it... - if [[ "$toy" = "chattr" ]]; then - non_toy_failures="$non_toy_failures $toy" - else - failures="$failures $toy" - fi + failures="$failures $toy" fi } diff --git a/tests/sh.test b/tests/sh.test index 6a121ce2..dd18af71 100755 --- a/tests/sh.test +++ b/tests/sh.test @@ -169,7 +169,7 @@ testing "subshell exit err" '(exit 42); echo $?' "42\n" "" "" # Same thing twice, but how do we cmp if exec exited? #testing 'exec and $$' testing 'echo $$;exec readlink /proc/self' -X="$(which readlink)" +X="$(realpath $(which readlink))" testing "exec in paren" \ '(exec readlink /proc/self/exe);echo hello' "$X\nhello\n" "" "" testing "exec in brackets" \ |