From 1db4e9b4769f0f6747539d9954553d1431b7f6f4 Mon Sep 17 00:00:00 2001 From: yury Date: Wed, 16 Apr 2008 20:52:22 +0000 Subject: [PATCH] b=14901 r=adilger,grev - make synchronous fix for HEAD as in 1.6. Do not use RUNAS_ID + 1 in test_72. --- lustre/tests/sanity.sh | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/lustre/tests/sanity.sh b/lustre/tests/sanity.sh index 51cee3d..b3b7aa9 100644 --- a/lustre/tests/sanity.sh +++ b/lustre/tests/sanity.sh @@ -126,7 +126,6 @@ rm -rf $DIR/[Rdfs][0-9]* [ $UID -eq 0 -a $RUNAS_ID -eq 0 ] && error "\$RUNAS_ID set to 0, but \$UID is also 0!" check_runas_id $RUNAS_ID $RUNAS -check_runas_id $(($RUNAS_ID + 1)) "$RUNAS -u $(($RUNAS_ID + 1))" build_test_filter @@ -3013,22 +3012,19 @@ run_test 71 "Running dbench on lustre (don't segment fault) ====" test_72() { # bug 5695 - Test that on 2.6 remove_suid works properly check_kernel_version 43 || return 0 + [ "$RUNAS_ID" = "$UID" ] && skip "RUNAS_ID = UID = $UID -- skipping" && return # Check that testing environment is properly set up. Skip if not - OLD_FAIL_ON_ERROR=$FAIL_ON_ERROR - FAIL_ON_ERROR=false check_runas_id_ret $(($RUNAS_ID + 1)) "$RUNAS -u $(($RUNAS_ID + 1))" || { - skip "User $((RUNAS_ID + 1)) does not exist - skipping" - FAIL_ON_ERROR=$OLD_FAIL_ON_ERROR + FAIL_ON_ERROR=false check_runas_id_ret $RUNAS_ID $RUNAS || { + skip "User $RUNAS_ID does not exist - skipping" return 0 } - FAIL_ON_ERROR=$OLD_FAIL_ON_ERROR - [ "$RUNAS_ID" = "$UID" ] && skip "RUNAS_ID = UID = $UID -- skipping" && return # We had better clear the $DIR to get enough space for dd rm -rf $DIR/* touch $DIR/f72 chmod 777 $DIR/f72 chmod ug+s $DIR/f72 - $RUNAS -u $(($RUNAS_ID + 1)) dd if=/dev/zero of=$DIR/f72 bs=512 count=1 || error + $RUNAS dd if=/dev/zero of=$DIR/f72 bs=512 count=1 || error # See if we are still setuid/sgid test -u $DIR/f72 -o -g $DIR/f72 && error "S/gid is not dropped on write" # Now test that MDS is updated too -- 1.8.3.1