diff options
| author | Denys Vlasenko <vda.linux@googlemail.com> | 2020-02-26 11:05:52 +0300 |
|---|---|---|
| committer | Denys Vlasenko <vda.linux@googlemail.com> | 2020-02-26 11:05:52 +0300 |
| commit | 9aa751b08ab03d6396f86c3df77937a19687981b (patch) | |
| tree | df06300822ac071de0b913c6168f65cf8ffbe3eb | |
| parent | 1555895b4af44ce47fe2365aec82e8e67c685f08 (diff) | |
shells: fix exitcode_trapN tests to avoid races
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
| -rwxr-xr-x | shell/ash_test/ash-misc/exitcode_trap2.tests | 3 | ||||
| -rwxr-xr-x | shell/ash_test/ash-misc/exitcode_trap6.tests | 3 | ||||
| -rwxr-xr-x | shell/hush_test/hush-misc/exitcode_trap2.tests | 3 | ||||
| -rwxr-xr-x | shell/hush_test/hush-misc/exitcode_trap6.tests | 3 |
4 files changed, 4 insertions, 8 deletions
diff --git a/shell/ash_test/ash-misc/exitcode_trap2.tests b/shell/ash_test/ash-misc/exitcode_trap2.tests index f259774bf..aff6d5187 100755 --- a/shell/ash_test/ash-misc/exitcode_trap2.tests +++ b/shell/ash_test/ash-misc/exitcode_trap2.tests @@ -3,7 +3,6 @@ $THIS_SH -c ' trap "false;exit" term kill $$ & - (exit 42) - wait + (sleep 1; exit 42) ' echo 42:$? diff --git a/shell/ash_test/ash-misc/exitcode_trap6.tests b/shell/ash_test/ash-misc/exitcode_trap6.tests index 15fb99d2d..59a07fc91 100755 --- a/shell/ash_test/ash-misc/exitcode_trap6.tests +++ b/shell/ash_test/ash-misc/exitcode_trap6.tests @@ -5,7 +5,6 @@ $THIS_SH -c ' trap "echo INT" int trap "kill -int $$;exit" term kill $$ & - (exit 42) - wait + (sleep 1; exit 42) ' echo 42:$? diff --git a/shell/hush_test/hush-misc/exitcode_trap2.tests b/shell/hush_test/hush-misc/exitcode_trap2.tests index f259774bf..aff6d5187 100755 --- a/shell/hush_test/hush-misc/exitcode_trap2.tests +++ b/shell/hush_test/hush-misc/exitcode_trap2.tests @@ -3,7 +3,6 @@ $THIS_SH -c ' trap "false;exit" term kill $$ & - (exit 42) - wait + (sleep 1; exit 42) ' echo 42:$? diff --git a/shell/hush_test/hush-misc/exitcode_trap6.tests b/shell/hush_test/hush-misc/exitcode_trap6.tests index 15fb99d2d..59a07fc91 100755 --- a/shell/hush_test/hush-misc/exitcode_trap6.tests +++ b/shell/hush_test/hush-misc/exitcode_trap6.tests @@ -5,7 +5,6 @@ $THIS_SH -c ' trap "echo INT" int trap "kill -int $$;exit" term kill $$ & - (exit 42) - wait + (sleep 1; exit 42) ' echo 42:$? |