b=18956

i=Jian.Yu
add write_disjoint to acc-sm

diff --git a/lustre/tests/metadata-updates.sh b/lustre/tests/metadata-updates.sh
index 68f8077..e8de813 100755 (executable)
--- a/lustre/tests/metadata-updates.sh
+++ b/lustre/tests/metadata-updates.sh
@@ -276,12 +276,12 @@ do_partial_delete $(($NUM_FILES / 2)) || exit ${PIPESTATUS[0]}
 check_dir_contents $(($NUM_FILES / 2 + 1)) || STATUS=1
 
 # "write_disjoint" test
-echo "Part 5. write_disjoint test: see lustre/tests/write_disjoint.c for details"
+echo "Part 5. write_disjoint test: see lustre/tests/mpi/write_disjoint.c for details"
 if [ -f "$WRITE_DISJOINT" ]; then
     set $TRACE
     MACHINEFILE=${MACHINEFILE:-$TMP/$(basename $0 .sh).machines}
     generate_machine_file $NODES_TO_USE $MACHINEFILE
-    mpi_run -np $(get_node_count ${NODES_TO_USE//,/ }) $MACHINEFILE \
+    mpi_run -np $(get_node_count ${NODES_TO_USE//,/ }) -machinefile $MACHINEFILE \
     $WRITE_DISJOINT -f $WRITE_DISJOINT_FILE -n $NUMLOOPS || STATUS=1
 else
     skip "$0 : write_disjoint not found "

diff --git a/lustre/tests/mpi/Makefile.am b/lustre/tests/mpi/Makefile.am
index 805cdd3..bf0c1cb 100644 (file)
--- a/lustre/tests/mpi/Makefile.am
+++ b/lustre/tests/mpi/Makefile.am
@@ -4,11 +4,13 @@ AM_CFLAGS = $(LLCFLAGS)
 
 CC = @MPICC_WRAPPER@
 
-noinst_PROGRAMS = parallel_grouplock write_append_truncate createmany_mpi mdsrate
+noinst_PROGRAMS = parallel_grouplock write_append_truncate createmany_mpi
+noinst_PROGRAMS += mdsrate write_disjoint
 testdir = $(libdir)/lustre/tests
 test_SCRIPTS = $(noinst_PROGRAMS)
 
 write_append_truncate_SOURCES=write_append_truncate.c
+write_disjoint_SOURCES=write_disjoint.c
 createmany_mpi_SOURCES=createmany-mpi.c
 parallel_grouplock_SOURCES=parallel_grouplock.c lp_utils.c lp_utils.h
 mdsrate_SOURCES=mdsrate.c

diff --git a/lustre/tests/write_append_truncate.1 b/lustre/tests/mpi/write_append_truncate.1
similarity index 100%
rename from lustre/tests/write_append_truncate.1
rename to lustre/tests/mpi/write_append_truncate.1

diff --git a/lustre/tests/write_disjoint.c b/lustre/tests/mpi/write_disjoint.c
similarity index 98%
rename from lustre/tests/write_disjoint.c
rename to lustre/tests/mpi/write_disjoint.c
index e02287d..9b28d60 100644 (file)
--- a/lustre/tests/write_disjoint.c
+++ b/lustre/tests/mpi/write_disjoint.c
@@ -193,7 +193,7 @@ int main (int argc, char *argv[]) {
 
                         for (i = 0; i < noProcessors; i++) {
                                 char command[4096];
-                                int j;
+                                int j, rc;
                                 if (!memcmp(read_buf + (i * CHUNK_SIZE(n)),
                                             chunk_buf[i], CHUNK_SIZE(n)))
                                         continue;
@@ -218,7 +218,7 @@ int main (int argc, char *argv[]) {
                                 }
 
                                 sprintf(command, "od -Ad -a %s", filename);
-                                system(command);
+                                rc = system(command);
                                 rprintf(0, n, "data check error - exiting\n");
                         }
                 }