LU-1193 tests: test script fixes for incompatibility

[fs/lustre-release.git] / lustre / tests / performance-sanity.sh

diff --git a/lustre/tests/performance-sanity.sh b/lustre/tests/performance-sanity.sh
index 0139f0c..fd13747 100644 (file)
--- a/lustre/tests/performance-sanity.sh
+++ b/lustre/tests/performance-sanity.sh
@@ -11,17 +11,22 @@ LUSTRE=${LUSTRE:-`dirname $0`/..}
 init_test_env $@
 
 . ${CONFIG:=$LUSTRE/tests/cfg/$NAME.sh}
+init_logging
 
 [ -x "$MDSRATE" ] || FAIL_ON_ERROR=true error "No mdsrate program. Aborting."
 which mpirun > /dev/null 2>&1 || \
        FAIL_ON_ERROR=true error "No mpirun program. Aborting." 
 
 # Skip these tests
-# bug number:  15266 15266 15266
-ALWAYS_EXCEPT="1     2     6     $PERFORMANCE_SANITY_EXCEPT"
+# bug number:  15266 15266 
+ALWAYS_EXCEPT="1     2    $PERFORMANCE_SANITY_EXCEPT"
 
 build_test_filter
 
+get_mpiuser_id $MPI_USER
+MPI_RUNAS=${MPI_RUNAS:-"runas -u $MPI_USER_UID -g $MPI_USER_GID"}
+$GSS_KRB5 && refresh_krb5_tgt $MPI_USER_UID $MPI_USER_GID $MPI_RUNAS
+
 # single-IOR-rates
 test_1() {
     echo "Single client I/O performance as a percentage of raw"
@@ -76,6 +81,7 @@ test_8() {
 }
 run_test 8 "getattr large files ======"
 
-equals_msg `basename $0`: test complete, cleaning up
+complete $(basename $0) $SECONDS
 check_and_cleanup_lustre
 [ -f "$LOG" ] && cat $LOG || true
+exit_status