From 9f5e18a40390b79583ea465d35f7f8c5068789d2 Mon Sep 17 00:00:00 2001 From: grev Date: Fri, 8 May 2009 08:02:09 +0000 Subject: [PATCH] b=18921 i=Robert.Read rename type2 tests to parallel-scale --- lustre/tests/Makefile.am | 2 +- lustre/tests/acceptance-small.sh | 12 ++++++------ lustre/tests/{type2-tests.sh => parallel-scale.sh} | 0 3 files changed, 7 insertions(+), 7 deletions(-) rename lustre/tests/{type2-tests.sh => parallel-scale.sh} (100%) diff --git a/lustre/tests/Makefile.am b/lustre/tests/Makefile.am index 5bdf9ab..3f59d5f 100644 --- a/lustre/tests/Makefile.am +++ b/lustre/tests/Makefile.am @@ -18,7 +18,7 @@ noinst_SCRIPTS += mdsrate-stat-small.sh mdsrate-stat-large.sh replay-vbr.sh noinst_SCRIPTS += lockorder.sh socketclient socketserver runmultiop_bg_pause noinst_SCRIPTS += recovery-mds-scale.sh run_dd.sh run_tar.sh run_iozone.sh noinst_SCRIPTS += run_dbench.sh recovery-double-scale.sh -noinst_SCRIPTS += recovery-random-scale.sh type2-tests.sh +noinst_SCRIPTS += recovery-random-scale.sh parallel-scale.sh nobase_noinst_SCRIPTS = cfg/local.sh nobase_noinst_SCRIPTS += acl/make-tree acl/run cfg/ncli.sh nobase_noinst_SCRIPTS += racer/dir_create.sh racer/file_create.sh racer/file_list.sh diff --git a/lustre/tests/acceptance-small.sh b/lustre/tests/acceptance-small.sh index 717b3f4..8d8cc8d 100755 --- a/lustre/tests/acceptance-small.sh +++ b/lustre/tests/acceptance-small.sh @@ -23,7 +23,7 @@ fi [ "$DEBUG_OFF" ] || DEBUG_OFF="eval lctl set_param debug=\"$DEBUG_LVL\"" [ "$DEBUG_ON" ] || DEBUG_ON="eval lctl set_param debug=0x33f0484" -export TESTSUITE_LIST="RUNTESTS SANITY DBENCH BONNIE IOZONE FSX SANITYN LFSCK LIBLUSTRE RACER REPLAY_SINGLE CONF_SANITY RECOVERY_SMALL REPLAY_OST_SINGLE REPLAY_DUAL REPLAY_VBR INSANITY SANITY_QUOTA PERFORMANCE_SANITY LARGE_SCALE RECOVERY_MDS_SCALE RECOVERY_DOUBLE_SCALE RECOVERY_RANDOM_SCALE TYPE2_TESTS" +export TESTSUITE_LIST="RUNTESTS SANITY DBENCH BONNIE IOZONE FSX SANITYN LFSCK LIBLUSTRE RACER REPLAY_SINGLE CONF_SANITY RECOVERY_SMALL REPLAY_OST_SINGLE REPLAY_DUAL REPLAY_VBR INSANITY SANITY_QUOTA PERFORMANCE_SANITY LARGE_SCALE RECOVERY_MDS_SCALE RECOVERY_DOUBLE_SCALE RECOVERY_RANDOM_SCALE PARALLEL_SCALE" if [ "$ACC_SM_ONLY" ]; then for O in $TESTSUITE_LIST; do @@ -452,11 +452,11 @@ if [ "$RECOVERY_RANDOM_SCALE" != "no" ]; then RECOVERY_RANDOM_SCALE="done" fi -which mpirun > /dev/null 2>&1 || TYPE2_TESTS="no" -if [ "$TYPE2_TESTS" != "no" ]; then - title type2 tests - bash type2-tests.sh - TYPE2_TESTS="done" +which mpirun > /dev/null 2>&1 || PARALLEL_SCALE="no" +if [ "$PARALLEL_SCALE" != "no" ]; then + title parallel-scale + bash parallel-scale.sh + PARALLEL_SCALE="done" fi RC=$? diff --git a/lustre/tests/type2-tests.sh b/lustre/tests/parallel-scale.sh similarity index 100% rename from lustre/tests/type2-tests.sh rename to lustre/tests/parallel-scale.sh -- 1.8.3.1