From: Garrett C. <ris...@li...> - 2010-07-21 09:21:56
|
The branch, master, has been updated via 5337e87014f42586915d091097ec1eacbd1f4e81 (commit) via 2ebc103b1b64660907f690d6e7c84dcc73b94f86 (commit) via e0a89f94e51eaed1c3ac9840130f166f3f232b4a (commit) via dc9a6950b7ad6324dac774bc7717dfd1a52995fe (commit) from a2739948cbdcb4a8981f3e75fe67f1921a075058 (commit) - Log ----------------------------------------------------------------- commit 5337e87014f42586915d091097ec1eacbd1f4e81 Author: Garrett Cooper <yan...@gm...> Date: Wed Jul 21 02:18:38 2010 -0700 Fix source path for install. Test case "mc_opts" fails as it is not able to install "opts" and "opts_e" files at desired location. This is because the path of these files mentioned in the "mc_opts" script is incorrect. Following patch fixes the above problem. Signed-off-by: Sumit Dhoot <su...@li...> Acked-by: Garrett Cooper <yan...@gm...> commit 2ebc103b1b64660907f690d6e7c84dcc73b94f86 Author: Garrett Cooper <yan...@gm...> Date: Wed Jul 21 02:17:17 2010 -0700 Update location for multicast tests. While running networktest for multicast ; "mc_member" test displays the following error message multiple times "cat: /opt/ltp/testcases/inetwork/multicast/mc_menmber/ManyGroups: No such file or directory". This is Because variable "TCsrc" is exported with incorrect path. Looks like previously LTP test scripts installed and ran directly from source directory . Now it installs mulicast test binary and script files to "$LTPROOT/testcases/bin" directory. Hence the variable "TCsrc" needed to be exported with above mentioned install path. Signed-off-by: Sumit Dhoot <su...@li...> Acked-by: Garrett Cooper <yan...@gm...> commit e0a89f94e51eaed1c3ac9840130f166f3f232b4a Author: Garrett Cooper <yan...@gm...> Date: Wed Jul 21 02:15:21 2010 -0700 Address issue with permissions on utimesat_tests. After investigation, I found that the following two parts maybe have wrong RW parameter: a) Testing read-only file, owned by nobody(self). Since the perm is 400, the user `nobody' itself doesn't have write permission to the testfile, thus, if program executes ./utimensat01 with -w param, `Permission deined' error will occur. So we need to add -W in run_test param to avoid trying writing test. b) Testing read-only file, owned by root. Since root owns the test file and the perm is still 400, the user `nobody' has neither writing nor reading permission to this file, so -RW param should be both set to run_test function to avoid trying reading & writing test. Signed-off-by: Caspar Zhang <cz...@re...> Acked-by: Garrett Cooper <yan...@gm...> commit dc9a6950b7ad6324dac774bc7717dfd1a52995fe Author: Garrett Cooper <yan...@gm...> Date: Wed Jul 21 02:12:15 2010 -0700 Fix test when dealing w/ new versions of file. This is a POSIX-friendly patch which uses grep -E instead of egrep. Suggested-by: Caspar Zhang <cz...@re...> Signed-off-by: Garrett Cooper <yan...@gm...> ----------------------------------------------------------------------- Summary of changes: runtest/multicast | 6 ++-- testcases/commands/ade/file/file_test.sh | 2 +- .../kernel/syscalls/utimensat/utimensat_tests.sh | 24 ++++++++++---------- testcases/network/multicast/mc_opts/mc_opts | 2 +- 4 files changed, 17 insertions(+), 17 deletions(-) diff --git a/runtest/multicast b/runtest/multicast index 14e7828..08b65f7 100644 --- a/runtest/multicast +++ b/runtest/multicast @@ -3,6 +3,6 @@ # PLEASE READ THE README FILE IN /multicast BEFORE RUNNING THESE. # mc_cmds mc_cmds -mc_commo export TCsrc=$LTPROOT/testcases/network/multicast/mc_commo; mc_commo -mc_member export TCsrc=$LTPROOT/testcases/network/multicast/mc_member; mc_member -mc_opts export TCsrc=$LTPROOT/testcases/network/multicast/mc_opts; mc_opts +mc_commo export TCsrc=$LTPROOT/testcases/bin; mc_commo +mc_member export TCsrc=$LTPROOT/testcases/bin; mc_member +mc_opts export TCsrc=$LTPROOT/testcases/bin; mc_opts diff --git a/testcases/commands/ade/file/file_test.sh b/testcases/commands/ade/file/file_test.sh index 9232c10..70420e3 100755 --- a/testcases/commands/ade/file/file_test.sh +++ b/testcases/commands/ade/file/file_test.sh @@ -556,7 +556,7 @@ file $bDIR/SRPMS/cprog-0.0.7-3.src.rpm > $LTPTMP/file.out 2>&1 if [ $? -eq 0 ] then - grep "RPM v3 src" $LTPTMP/file.out > /dev/null 2>&1 + grep -E "RPM v3(\.0)? src" $LTPTMP/file.out > /dev/null 2>&1 if [ $? -eq 0 ] then $LTPBIN/tst_resm TPASS "file: Recognised RPM file correctly" diff --git a/testcases/kernel/syscalls/utimensat/utimensat_tests.sh b/testcases/kernel/syscalls/utimensat/utimensat_tests.sh index 4246d1a..a861d61 100644 --- a/testcases/kernel/syscalls/utimensat/utimensat_tests.sh +++ b/testcases/kernel/syscalls/utimensat/utimensat_tests.sh @@ -288,22 +288,22 @@ echo "Testing read-only file, owned by self" echo echo "***** Testing times==NULL case *****" -run_test "" 400 "" "" SUCCESS y y +run_test -W "" 400 "" "" SUCCESS y y echo "***** Testing times=={ UTIME_NOW, UTIME_NOW } case *****" -run_test "" 400 "" "0 n 0 n" SUCCESS y y +run_test -W "" 400 "" "0 n 0 n" SUCCESS y y echo "***** Testing times=={ UTIME_OMIT, UTIME_OMIT } case *****" -run_test "" 400 "" "0 o 0 o" SUCCESS n n +run_test -W "" 400 "" "0 o 0 o" SUCCESS n n echo "***** Testing times=={ UTIME_NOW, UTIME_OMIT } case *****" -run_test "" 400 "" "0 n 0 o" SUCCESS y n +run_test -W "" 400 "" "0 n 0 o" SUCCESS y n echo "***** Testing times=={ UTIME_OMIT, UTIME_NOW } case *****" -run_test "" 400 "" "0 o 0 n" SUCCESS n y +run_test -W "" 400 "" "0 o 0 n" SUCCESS n y echo "***** Testing times=={ x, y } case *****" -run_test "" 400 "" "1 1 1 1" SUCCESS y y +run_test -W "" 400 "" "1 1 1 1" SUCCESS y y echo "============================================================" @@ -312,22 +312,22 @@ echo "Testing read-only file, not owned by self" echo echo "***** Testing times==NULL case *****" -run_test root 400 "" "" EACCES +run_test -RW root 400 "" "" EACCES echo "***** Testing times=={ UTIME_NOW, UTIME_NOW } case *****" -run_test root 400 "" "0 n 0 n" EACCES +run_test -RW root 400 "" "0 n 0 n" EACCES echo "***** Testing times=={ UTIME_OMIT, UTIME_OMIT } case *****" -run_test root 400 "" "0 o 0 o" SUCCESS n n +run_test -RW root 400 "" "0 o 0 o" SUCCESS n n echo "***** Testing times=={ UTIME_NOW, UTIME_OMIT } case *****" -run_test root 400 "" "0 n 0 o" EPERM +run_test -RW root 400 "" "0 n 0 o" EPERM echo "***** Testing times=={ UTIME_OMIT, UTIME_NOW } case *****" -run_test root 400 "" "0 o 0 n" EPERM +run_test -RW root 400 "" "0 o 0 n" EPERM echo "***** Testing times=={ x, y } case *****" -run_test root 400 "" "1 1 1 1" EPERM +run_test -RW root 400 "" "1 1 1 1" EPERM echo "============================================================" diff --git a/testcases/network/multicast/mc_opts/mc_opts b/testcases/network/multicast/mc_opts/mc_opts index 76fbe37..a0103bd 100755 --- a/testcases/network/multicast/mc_opts/mc_opts +++ b/testcases/network/multicast/mc_opts/mc_opts @@ -57,7 +57,7 @@ setup() mkdir -p $TCtmp for i in $EXECUTABLES do - install -m 0755 "$LTPROOT/$i" "$TCtmp/." + install -m 0755 "$LTPROOT/testcases/bin/$i" "$TCtmp/." done } hooks/post-receive -- ltp |