diff options
| -rwxr-xr-x | tests/cp/nfs-removal-race.sh | 6 | ||||
| -rwxr-xr-x | tests/cp/no-ctx.sh | 6 | ||||
| -rwxr-xr-x | tests/df/no-mtab-status.sh | 2 | ||||
| -rwxr-xr-x | tests/df/skip-duplicates.sh | 10 | ||||
| -rwxr-xr-x | tests/ls/getxattr-speedup.sh | 2 | ||||
| -rwxr-xr-x | tests/rm/r-root.sh | 2 |
6 files changed, 16 insertions, 12 deletions
diff --git a/tests/cp/nfs-removal-race.sh b/tests/cp/nfs-removal-race.sh index 70276a384..fdac03f7d 100755 --- a/tests/cp/nfs-removal-race.sh +++ b/tests/cp/nfs-removal-race.sh @@ -35,6 +35,7 @@ require_gcc_shared_ # Replace each stat call with a call to this wrapper. cat > k.c <<'EOF' || framework_failure_ #define _GNU_SOURCE +#include <stdio.h> #include <sys/types.h> #include <dlfcn.h> @@ -49,6 +50,7 @@ int __xstat (int ver, const char *path, struct stat *st) { static int (*real_stat)(int ver, const char *path, struct stat *st) = NULL; + fclose(fopen("preloaded", "w")); if (!real_stat) real_stat = dlsym (RTLD_NEXT, "__xstat"); /* When asked to stat nonexistent "d", @@ -65,7 +67,9 @@ touch d2 || framework_failure_ echo xyz > src || framework_failure_ # Finally, run the test: -LD_PRELOAD=./k.so cp src d || fail=1 +LD_PRELOAD=$LD_PRELOAD:./k.so cp src d || fail=1 + +test -f preloaded || skip_ 'LD_PRELOAD was ineffective?' compare src d || fail=1 Exit $fail diff --git a/tests/cp/no-ctx.sh b/tests/cp/no-ctx.sh index 377d203b0..852b8e641 100755 --- a/tests/cp/no-ctx.sh +++ b/tests/cp/no-ctx.sh @@ -50,14 +50,14 @@ gcc_shared_ k.c k.so \ touch file_src # New file with SELinux context optionally included -LD_PRELOAD=./k.so cp -a file_src file_dst || fail=1 +LD_PRELOAD=$LD_PRELOAD:./k.so cp -a file_src file_dst || fail=1 # Existing file with SELinux context optionally included -LD_PRELOAD=./k.so cp -a file_src file_dst || fail=1 +LD_PRELOAD=$LD_PRELOAD:./k.so cp -a file_src file_dst || fail=1 # ENODATA should give an immediate error when required to preserve ctx # This is debatable, and maybe we should not fail when no context available? -( export LD_PRELOAD=./k.so +( export LD_PRELOAD=$LD_PRELOAD:./k.so returns_ 1 cp --preserve=context file_src file_dst ) || fail=1 test -e preloaded || skip_ 'LD_PRELOAD interception failed' diff --git a/tests/df/no-mtab-status.sh b/tests/df/no-mtab-status.sh index 41d1b521b..c35da6b8c 100755 --- a/tests/df/no-mtab-status.sh +++ b/tests/df/no-mtab-status.sh @@ -90,7 +90,7 @@ gcc_shared_ k.c k.so \ cleanup_() { unset LD_PRELOAD; } -export LD_PRELOAD=./k.so +export LD_PRELOAD=$LD_PRELOAD:./k.so # Test if LD_PRELOAD works: df 2>/dev/null diff --git a/tests/df/skip-duplicates.sh b/tests/df/skip-duplicates.sh index c13787665..406960473 100755 --- a/tests/df/skip-duplicates.sh +++ b/tests/df/skip-duplicates.sh @@ -146,23 +146,23 @@ gcc_shared_ k.c k.so \ || framework_failure_ 'failed to build shared library' # Test if LD_PRELOAD works: -LD_PRELOAD=./k.so df +LD_PRELOAD=$LD_PRELOAD:./k.so df test -f x || skip_ "internal test failure: maybe LD_PRELOAD doesn't work?" # The fake mtab file should only contain entries # having the same device number; thus the output should # consist of a header and unique entries. -LD_PRELOAD=./k.so df -T >out || fail=1 +LD_PRELOAD=$LD_PRELOAD:./k.so df -T >out || fail=1 test $(wc -l <out) -eq $(expr 1 + $unique_entries) || { fail=1; cat out; } # With --total we should suppress the duplicate but separate remote file system -LD_PRELOAD=./k.so df --total >out || fail=1 +LD_PRELOAD=$LD_PRELOAD:./k.so df --total >out || fail=1 test "$CU_REMOTE_FS" && elide_remote=1 || elide_remote=0 test $(wc -l <out) -eq $(expr 2 + $unique_entries - $elide_remote) || { fail=1; cat out; } # Ensure we don't fail when unable to stat (currently) unavailable entries -LD_PRELOAD=./k.so CU_TEST_DUPE_INVALID=1 df -T >out || fail=1 +LD_PRELOAD=$LD_PRELOAD:./k.so CU_TEST_DUPE_INVALID=1 df -T >out || fail=1 test $(wc -l <out) -eq $(expr 1 + $unique_entries) || { fail=1; cat out; } # df should also prefer "/fsname" over "fsname" @@ -176,7 +176,7 @@ fi test $(grep -c 'virtfs2.*t2' <out) -eq 1 || { fail=1; cat out; } # Ensure that filtering duplicates does not affect -a processing. -LD_PRELOAD=./k.so df -a >out || fail=1 +LD_PRELOAD=$LD_PRELOAD:./k.so df -a >out || fail=1 total_fs=6; test "$CU_REMOTE_FS" && total_fs=$(expr $total_fs + 3) test $(wc -l <out) -eq $total_fs || { fail=1; cat out; } # Ensure placeholder "-" values used for the eclipsed "virtfs" diff --git a/tests/ls/getxattr-speedup.sh b/tests/ls/getxattr-speedup.sh index f84c9da61..be43c50e4 100755 --- a/tests/ls/getxattr-speedup.sh +++ b/tests/ls/getxattr-speedup.sh @@ -55,7 +55,7 @@ gcc_shared_ k.c k.so \ seq 20 | xargs touch || framework_failure_ # Finally, run the test: -LD_PRELOAD=./k.so ls --color=always -l . || fail=1 +LD_PRELOAD=$LD_PRELOAD:./k.so ls --color=always -l . || fail=1 test -f x || skip_ "internal test failure: maybe LD_PRELOAD doesn't work?" diff --git a/tests/rm/r-root.sh b/tests/rm/r-root.sh index 74d1a2a62..c06332ae2 100755 --- a/tests/rm/r-root.sh +++ b/tests/rm/r-root.sh @@ -89,7 +89,7 @@ exercise_rm_r_root () fi timeout --signal=KILL 2 \ - env LD_PRELOAD=./k.so $skip_exit \ + env LD_PRELOAD=$LD_PRELOAD:./k.so $skip_exit \ rm -rv --one-file-system "$@" > out 2> err return $? |