diff options
Diffstat (limited to 'tests/install')
| -rwxr-xr-x | tests/install/basic-1 | 6 | ||||
| -rwxr-xr-x | tests/install/install-C | 16 | ||||
| -rwxr-xr-x | tests/install/install-C-root | 2 | ||||
| -rwxr-xr-x | tests/install/install-C-selinux | 2 | ||||
| -rwxr-xr-x | tests/install/strip-program | 4 |
5 files changed, 15 insertions, 15 deletions
diff --git a/tests/install/basic-1 b/tests/install/basic-1 index 688e6beca..9863becf9 100755 --- a/tests/install/basic-1 +++ b/tests/install/basic-1 @@ -23,9 +23,9 @@ skip_if_root_ dir=dir file=file -rm -rf $dir $file || framework_failure -mkdir -p $dir || framework_failure -echo foo > $file || framework_failure +rm -rf $dir $file || framework_failure_ +mkdir -p $dir || framework_failure_ +echo foo > $file || framework_failure_ ginstall $file $dir || fail=1 # Make sure the source file still exists. diff --git a/tests/install/install-C b/tests/install/install-C index e66b74ffe..5adebdee9 100755 --- a/tests/install/install-C +++ b/tests/install/install-C @@ -25,11 +25,11 @@ mode2=0755 mode3=2755 -echo test > a || framework_failure -echo "\`a' -> \`b'" > out_installed_first || framework_failure +echo test > a || framework_failure_ +echo "\`a' -> \`b'" > out_installed_first || framework_failure_ echo "removed \`b' -\`a' -> \`b'" > out_installed_second || framework_failure -: > out_empty || framework_failure +\`a' -> \`b'" > out_installed_second || framework_failure_ +: > out_empty || framework_failure_ # destination file does not exist ginstall -Cv -m$mode1 a b > out || fail=1 @@ -54,22 +54,22 @@ ginstall -Cv -m$mode3 a b > out || fail=1 compare out out_installed_second || fail=1 # files are not regular files -ln -s a c || framework_failure -ln -s b d || framework_failure +ln -s a c || framework_failure_ +ln -s b d || framework_failure_ ginstall -Cv -m$mode1 c d > out || fail=1 echo "removed \`d' \`c' -> \`d'" > out_installed_second_cd compare out out_installed_second_cd || fail=1 # destination file exists but content differs -echo test1 > a || framework_failure +echo test1 > a || framework_failure_ ginstall -Cv -m$mode1 a b > out || fail=1 compare out out_installed_second || fail=1 ginstall -Cv -m$mode1 a b > out || fail=1 compare out out_empty || fail=1 # destination file exists but content differs (same size) -echo test2 > a || framework_failure +echo test2 > a || framework_failure_ ginstall -Cv -m$mode1 a b > out || fail=1 compare out out_installed_second || fail=1 ginstall -Cv -m$mode1 a b > out || fail=1 diff --git a/tests/install/install-C-root b/tests/install/install-C-root index 743f80efd..b46c4183c 100755 --- a/tests/install/install-C-root +++ b/tests/install/install-C-root @@ -27,7 +27,7 @@ g1=1 g2=2 -echo test > a || framework_failure +echo test > a || framework_failure_ echo "\`a' -> \`b'" > out_installed_first echo "removed \`b' \`a' -> \`b'" > out_installed_second diff --git a/tests/install/install-C-selinux b/tests/install/install-C-selinux index 072297dc8..64375415b 100755 --- a/tests/install/install-C-selinux +++ b/tests/install/install-C-selinux @@ -21,7 +21,7 @@ print_ver_ ginstall require_selinux_ -echo test > a || framework_failure +echo test > a || framework_failure_ chcon -u system_u a || skip_ "chcon doesn't work" echo "\`a' -> \`b'" > out_installed_first diff --git a/tests/install/strip-program b/tests/install/strip-program index d7971797e..0f1e9fa22 100755 --- a/tests/install/strip-program +++ b/tests/install/strip-program @@ -21,11 +21,11 @@ print_ver_ ginstall working_umask_or_skip_ -cat <<EOF > b || framework_failure +cat <<EOF > b || framework_failure_ #!$PREFERABLY_POSIX_SHELL sed s/b/B/ \$1 > \$1.t && mv \$1.t \$1 EOF -chmod a+x b || framework_failure +chmod a+x b || framework_failure_ echo abc > src || fail=1 |