[C-MPI-commits] SF.net SVN: c-mpi:[161] test

[<jmw...@us...>]

Revision: 161
          http://c-mpi.svn.sourceforge.net/c-mpi/?rev=161&view=rev
Author:   jmwozniak
Date:     2011-02-28 17:22:48 +0000 (Mon, 28 Feb 2011)

Log Message:
-----------
Use ${LAUNCH} to select srun in tests

Modified Paths:
--------------
    Makefile.in
    test/adts/module.mk.in
    test/adts/runtest.zsh
    test/cmpi/test-manyputs.zsh
    test/cmpi/test-putget.zsh
    test/cmpi/test-tables.zsh
    test/cmpi/test-update01.zsh
    test/cmpi/test-update02.zsh
    test/driver/test.zsh
    test/gossip/module.mk.in
    test/gossip/test-do.zsh
    test/gossip/test-env.zsh
    test/gossip/test-masks.zsh

Modified: Makefile.in
===================================================================
--- Makefile.in	2011-02-28 16:55:59 UTC (rev 160)
+++ Makefile.in	2011-02-28 17:22:48 UTC (rev 161)
@@ -1,4 +1,5 @@
 
+
 # LIST OF TARGETS WHICH MAY BE USED WHEN RUNNING MAKE:
 #
 # all            default rule; builds libs, server, and test programs
@@ -70,7 +71,7 @@
 # MPIARGS =  -f hosts
 MPDCHECK = tools/mpd-available.zsh @USE_MPI@/bin/mpdlistjobs
 
-# Job launch selection
+# Job launch selection (mpiexec or srun)
 ifeq (@HAVE_SRUN@,no)
 	LAUNCH = $(MPIEXEC) $(MPIARGS)
 else

Modified: test/adts/module.mk.in
===================================================================
--- test/adts/module.mk.in	2011-02-28 16:55:59 UTC (rev 160)
+++ test/adts/module.mk.in	2011-02-28 17:22:48 UTC (rev 161)
@@ -16,7 +16,7 @@
 
 $(DIR)/test%.out: $(DIR)/test%.x
 	$(Q) "  TEST		$(@) "
-	$(E) test/adts/runtest.zsh $(<) $(@) 2>&1
+	$(E) LAUNCH=$(LAUNCH) ; test/adts/runtest.zsh $(<) $(@) 2>&1
 
 $(DIR)/test-success.out: test/gossip/test-success.out \
                          $(TEST_ADTS_OUTPUT)

Modified: test/adts/runtest.zsh
===================================================================
--- test/adts/runtest.zsh	2011-02-28 16:55:59 UTC (rev 160)
+++ test/adts/runtest.zsh	2011-02-28 17:22:48 UTC (rev 161)
@@ -3,7 +3,7 @@
 PROG=$1
 OUTPUT=$2
 
-${PROG} > ${OUTPUT}
+${LAUNCH} ${PROG} > ${OUTPUT}
 if [[ $? != 0 ]]
 then
   mv -v ${OUTPUT} ${OUTPUT}.failed

Modified: test/cmpi/test-manyputs.zsh
===================================================================
--- test/cmpi/test-manyputs.zsh	2011-02-28 16:55:59 UTC (rev 160)
+++ test/cmpi/test-manyputs.zsh	2011-02-28 17:22:48 UTC (rev 161)
@@ -20,7 +20,7 @@
 
   # Monolithic execution (3 nodes, 3 clients):
 
-  mpiexec -n ${TOTAL} ${PROGRAM} -n ${NODES} -p reps=10 >& ${OUTPUT}
+  ${LAUNCH} -n ${TOTAL} ${PROGRAM} -n ${NODES} -p reps=10 >& ${OUTPUT}
   CODE=$?
   [[ ${CODE} == 0 ]] || crash "exit code was: ${CODE}"
 
@@ -29,7 +29,7 @@
   # KDA-2B execution:
 
   tools/startup_nodes.zsh $(( N-1 )) 100 &
-  mpiexec -n 1 test/cmpi/test01.x > CLIENT.out
+  ${LAUNCH} -n 1 test/cmpi/test01.x > CLIENT.out
   sleep $(( N+15 ))
 
 fi

Modified: test/cmpi/test-putget.zsh
===================================================================
--- test/cmpi/test-putget.zsh	2011-02-28 16:55:59 UTC (rev 160)
+++ test/cmpi/test-putget.zsh	2011-02-28 17:22:48 UTC (rev 161)
@@ -20,7 +20,7 @@
 
   # Monolithic execution (3 nodes, 3 clients):
 
-  mpiexec -n ${TOTAL} ${PROGRAM} -n ${NODES} >& ${OUTPUT}
+  ${LAUNCH} -n ${TOTAL} ${PROGRAM} -n ${NODES} >& ${OUTPUT}
   CODE=$?
   [[ ${CODE} == 0 ]] || crash "exit code was: ${CODE}"
 
@@ -29,7 +29,7 @@
   # KDA-2B execution:
 
   tools/startup_nodes.zsh $(( N-1 )) 100 &
-  mpiexec -n 1 test/cmpi/test01.x > CLIENT.out
+  ${LAUNCH} -n 1 test/cmpi/test01.x > CLIENT.out
   sleep $(( N+15 ))
 
 fi

Modified: test/cmpi/test-tables.zsh
===================================================================
--- test/cmpi/test-tables.zsh	2011-02-28 16:55:59 UTC (rev 160)
+++ test/cmpi/test-tables.zsh	2011-02-28 17:22:48 UTC (rev 161)
@@ -19,7 +19,7 @@
 then
 
   # Monolithic execution:
-  mpiexec -n ${TOTAL} ${PROGRAM} -n ${NODES} -p reps=10 >& ${OUTPUT}
+  ${LAUNCH} -n ${TOTAL} ${PROGRAM} -n ${NODES} -p reps=10 >& ${OUTPUT}
   CODE=$?
   [[ ${CODE} == 0 ]] || crash "exit code was: ${CODE}"
 
@@ -28,7 +28,7 @@
   # KDA-2B execution:
 
   tools/startup_nodes.zsh $(( N-1 )) 100 &
-  mpiexec -n 1 test/cmpi/test01.x > CLIENT.out
+  ${LAUNCH} -n 1 test/cmpi/test01.x > CLIENT.out
   sleep $(( N+15 ))
 
 fi

Modified: test/cmpi/test-update01.zsh
===================================================================
--- test/cmpi/test-update01.zsh	2011-02-28 16:55:59 UTC (rev 160)
+++ test/cmpi/test-update01.zsh	2011-02-28 17:22:48 UTC (rev 161)
@@ -19,7 +19,7 @@
 then
 
   # Monolithic execution:
-  mpiexec -n ${TOTAL} ${PROGRAM} -n ${NODES} -p reps=10 >& ${OUTPUT}
+  ${LAUNCH} -n ${TOTAL} ${PROGRAM} -n ${NODES} -p reps=10 >& ${OUTPUT}
   CODE=$?
   [[ ${CODE} == 0 ]] || crash "exit code was: ${CODE}"
 
@@ -28,7 +28,7 @@
   # KDA-2B execution:
 
   tools/startup_nodes.zsh $(( N-1 )) 100 &
-  mpiexec -n 1 test/cmpi/test01.x > CLIENT.out
+  ${LAUNCH} -n 1 test/cmpi/test01.x > CLIENT.out
   sleep $(( N+15 ))
 
 fi

Modified: test/cmpi/test-update02.zsh
===================================================================
--- test/cmpi/test-update02.zsh	2011-02-28 16:55:59 UTC (rev 160)
+++ test/cmpi/test-update02.zsh	2011-02-28 17:22:48 UTC (rev 161)
@@ -19,7 +19,7 @@
 
   # Monolithic execution:
 
-  mpiexec -n ${TOTAL} ${PROGRAM} -n ${CLIENTS} -p reps=10 >& ${OUTPUT}
+  ${LAUNCH} -n ${TOTAL} ${PROGRAM} -n ${CLIENTS} -p reps=10 >& ${OUTPUT}
   CODE=$?
   [[ ${CODE} == 0 ]] || crash "exit code was: ${CODE}"
 
@@ -28,7 +28,7 @@
   # KDA-2B execution:
 
   tools/startup_nodes.zsh $(( N-1 )) 100 &
-  mpiexec -n 1 test/cmpi/test01.x > CLIENT.out
+  ${LAUNCH} -n 1 test/cmpi/test01.x > CLIENT.out
   sleep $(( N+15 ))
 
 fi

Modified: test/driver/test.zsh
===================================================================
--- test/driver/test.zsh	2011-02-28 16:55:59 UTC (rev 160)
+++ test/driver/test.zsh	2011-02-28 17:22:48 UTC (rev 161)
@@ -25,7 +25,7 @@
 CMPI_OPTS="-p driver_dir=${DRIVER_DIR}"
 
 DRIVER=test/driver/test_driver.x
-mpiexec -n ${TOTAL} ${DRIVER} -n ${NODES} ${CMPI_OPTS} > ${OUTPUT} &
+${LAUNCH} -n ${TOTAL} ${DRIVER} -n ${NODES} ${CMPI_OPTS} > ${OUTPUT} &
 DRIVER_PID=${!}
 
 tools/timebomb.zsh ${$} 20 ${OUTPUT} $0 &

Modified: test/gossip/module.mk.in
===================================================================
--- test/gossip/module.mk.in	2011-02-28 16:55:59 UTC (rev 160)
+++ test/gossip/module.mk.in	2011-02-28 17:22:48 UTC (rev 161)
@@ -14,9 +14,9 @@
 
 $(DIR)/test%.out: $(DIR)/test%.x
 	$(Q) "  TEST		$(@) "
-	$(E)$(patsubst %.x, %.zsh, $(<)) $(<)
+	$(E)LAUNCH=$(LAUNCH) ; $(patsubst %.x, %.zsh, $(<)) $(<)
 
 $(DIR)/test-success.out: test/mpi_tools/test-success.out \
                          $(TEST_GOSSIP_OUTPUT)
 	$(Q) "  TOUCH		$(@) "
-	$(E) touch $(@)
+	$(E)touch $(@)

Modified: test/gossip/test-do.zsh
===================================================================
--- test/gossip/test-do.zsh	2011-02-28 16:55:59 UTC (rev 160)
+++ test/gossip/test-do.zsh	2011-02-28 17:22:48 UTC (rev 161)
@@ -9,15 +9,15 @@
 PROGRAM=$1
 OUTPUT=${PROGRAM%.x}.out
 
-${PROGRAM} > ${OUTPUT} 2>&1
+${LAUNCH} ${PROGRAM} > ${OUTPUT} 2>&1
 CODE=$?
 [[ ${CODE} == 0 ]] || crash "exit code was: ${CODE}"
 
-CMPI_DEBUG_MASK=example ${PROGRAM} >> ${OUTPUT} 2>&1
+CMPI_DEBUG_MASK=example ${LAUNCH} ${PROGRAM} >> ${OUTPUT} 2>&1
 CODE=$?
 [[ ${CODE} == 0 ]] || crash "exit code was: ${CODE}"
 
-CMPI_DEBUG_MASK=all ${PROGRAM} >> ${OUTPUT} 2>&1
+CMPI_DEBUG_MASK=all ${LAUNCH} ${PROGRAM} >> ${OUTPUT} 2>&1
 CODE=$?
 [[ ${CODE} == 0 ]] || crash "exit code was: ${CODE}"
 

Modified: test/gossip/test-env.zsh
===================================================================
--- test/gossip/test-env.zsh	2011-02-28 16:55:59 UTC (rev 160)
+++ test/gossip/test-env.zsh	2011-02-28 17:22:48 UTC (rev 161)
@@ -16,15 +16,15 @@
   exit 1
 }
 
-${PROGRAM} > ${OUTPUT} 2>&1
+${LAUNCH} ${PROGRAM} > ${OUTPUT} 2>&1
 CODE=$?
 [[ ${CODE} == 0 ]] || crash "exit code was: ${CODE}"
 
-CMPI_DEBUG_MASK=example ${PROGRAM} >> ${OUTPUT} 2>&1
+CMPI_DEBUG_MASK=example ${LAUNCH} ${PROGRAM} >> ${OUTPUT} 2>&1
 CODE=$?
 [[ ${CODE} == 0 ]] || crash "exit code was: ${CODE}"
 
-CMPI_DEBUG_MASK=all ${PROGRAM} >> ${OUTPUT} 2>&1
+CMPI_DEBUG_MASK=all ${LAUNCH} ${PROGRAM} >> ${OUTPUT} 2>&1
 CODE=$?
 [[ ${CODE} == 0 ]] || crash "exit code was: ${CODE}"
 

Modified: test/gossip/test-masks.zsh
===================================================================
--- test/gossip/test-masks.zsh	2011-02-28 16:55:59 UTC (rev 160)
+++ test/gossip/test-masks.zsh	2011-02-28 17:22:48 UTC (rev 161)
@@ -9,7 +9,7 @@
 PROGRAM=$1
 OUTPUT=${PROGRAM%.x}.out
 
-${PROGRAM} > ${OUTPUT} 2>&1
+${LAUNCH} ${PROGRAM} > ${OUTPUT} 2>&1
 CODE=$?
 [[ ${CODE} == 0 ]] || crash "exit code was: ${CODE}"
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.