[C-MPI-commits] SF.net SVN: c-mpi:[122] test/driver

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

Revision: 122
          http://c-mpi.svn.sourceforge.net/c-mpi/?rev=122&view=rev
Author:   jmwozniak
Date:     2010-05-14 20:00:27 +0000 (Fri, 14 May 2010)

Log Message:
-----------
Update driver tests based on new CMPI mode

Modified Paths:
--------------
    test/driver/module.mk.in
    test/driver/test-get.zsh
    test/driver/test-put.zsh
    test/driver/test-quit.zsh
    test/driver/test-sleep.zsh

Modified: test/driver/module.mk.in
===================================================================
--- test/driver/module.mk.in	2010-05-14 19:44:34 UTC (rev 121)
+++ test/driver/module.mk.in	2010-05-14 20:00:27 UTC (rev 122)
@@ -23,6 +23,14 @@
 TEST_DRIVER = test/driver/test_driver.x
 TEST_DRIVER_IMPL = test/driver/test_driver_fifo.o
 
+ifeq (@USE_CMPI_MODE@,MONO)
+	NODES := 5
+	CLIENTS := 1
+else
+	NODES := 3
+	CLIENTS := 3
+endif
+
 $(TEST_DRIVER): $(TEST_DRIVER_IMPL) test/driver/test_helpers.o $(CMPI)
 	$(Q) "  LINK		$(@) "
 	$(E) $(MPICC) $(MPE) $(<) test/driver/test_helpers.o \
@@ -35,7 +43,7 @@
 
 test/driver/test%.out: test/driver/test%.zsh $(TEST_PROGS) $(TEST_DRIVER)
 	$(Q) "  TEST		$(@) "
-	$(E) $(<) $(@)
+	$(E) $(<) $(@) $(NODES) $(CLIENTS)
 
 test/driver/test-success.out: test/cmpi/test-success.out \
                               $(TEST_DRIVER_OUTPUT)

Modified: test/driver/test-get.zsh
===================================================================
--- test/driver/test-get.zsh	2010-05-14 19:44:34 UTC (rev 121)
+++ test/driver/test-get.zsh	2010-05-14 20:00:27 UTC (rev 122)
@@ -3,7 +3,11 @@
 # Put/get case
 
 OUTPUT=$1
+NODES=$2
+CLIENTS=$3
 
+TOTAL=$(( NODES+CLIENTS ))
+
 source tools/test-helpers.zsh
 
 bail()
@@ -12,7 +16,7 @@
   crash $1
 }
 
-mpiexec -n 5 test/driver/test_driver.x -n 4 > ${OUTPUT} &
+mpiexec -n ${TOTAL} test/driver/test_driver.x -n ${NODES} > ${OUTPUT} &
 DRIVER_PID=${!}
 
 tools/timebomb.zsh ${$} 10 ${OUTPUT} $0 &
@@ -29,11 +33,6 @@
 wait ${DRIVER_PID}
 kill ${BOMB_PID}
 
-N=$( grep -c "Normal exit" ${OUTPUT} )
-if (( N != 5 ))
-then
-  mv -v ${OUTPUT} ${OUTPUT}.failed
-  exit 1
-fi
+check_exits ${TOTAL} ${OUTPUT}
 
 return 0

Modified: test/driver/test-put.zsh
===================================================================
--- test/driver/test-put.zsh	2010-05-14 19:44:34 UTC (rev 121)
+++ test/driver/test-put.zsh	2010-05-14 20:00:27 UTC (rev 122)
@@ -3,8 +3,14 @@
 # Just do a put
 
 OUTPUT=$1
+NODES=$2
+CLIENTS=$3
 
-mpiexec -n 5 test/driver/test_driver.x -n 4 > ${OUTPUT} &
+TOTAL=$(( NODES+CLIENTS ))
+
+source tools/test-helpers.zsh
+
+mpiexec -n ${TOTAL} test/driver/test_driver.x -n ${NODES} > ${OUTPUT} &
 DRIVER_PID=${!}
 
 tools/timebomb.zsh ${$} 10 ${OUTPUT} $0 &
@@ -19,11 +25,6 @@
 wait ${DRIVER_PID}
 kill ${BOMB_PID}
 
-N=$( grep -c "Normal exit" ${OUTPUT} )
-if (( N != 5 ))
-then
-  mv -v ${OUTPUT} ${OUTPUT}.failed
-  exit 1
-fi
+check_exits ${TOTAL} ${OUTPUT}
 
 return 0

Modified: test/driver/test-quit.zsh
===================================================================
--- test/driver/test-quit.zsh	2010-05-14 19:44:34 UTC (rev 121)
+++ test/driver/test-quit.zsh	2010-05-14 20:00:27 UTC (rev 122)
@@ -1,8 +1,14 @@
 #!/bin/zsh
 
 OUTPUT=$1
+NODES=$2
+CLIENTS=$3
 
-mpiexec -n 6 test/driver/test_driver.x -n 3 > ${OUTPUT} &
+TOTAL=$(( NODES+CLIENTS ))
+
+source tools/test-helpers.zsh
+
+mpiexec -n ${TOTAL} test/driver/test_driver.x -n ${NODES} > ${OUTPUT} &
 DRIVER_PID=${!}
 
 tools/timebomb.zsh ${$} 10 ${OUTPUT} $0 &
@@ -15,11 +21,6 @@
 wait ${DRIVER_PID}
 kill ${BOMB_PID}
 
-N=$( grep -c "Normal exit" ${OUTPUT} )
-if (( N != 6 ))
-then
-  mv -v ${OUTPUT} ${OUTPUT}.failed
-  exit 1
-fi
+check_exits ${TOTAL} ${OUTPUT}
 
 return 0

Modified: test/driver/test-sleep.zsh
===================================================================
--- test/driver/test-sleep.zsh	2010-05-14 19:44:34 UTC (rev 121)
+++ test/driver/test-sleep.zsh	2010-05-14 20:00:27 UTC (rev 122)
@@ -1,10 +1,16 @@
 #!/bin/zsh
 
-# Flex driver by issuing multiple simple commands
+# Flex driver by issuing simple commands
 
 OUTPUT=$1
+NODES=$2
+CLIENTS=$3
 
-mpiexec -n 5 test/driver/test_driver.x -n 4 > ${OUTPUT} &
+TOTAL=$(( NODES+CLIENTS ))
+
+source tools/test-helpers.zsh
+
+mpiexec -n ${TOTAL} test/driver/test_driver.x -n ${NODES} > ${OUTPUT} &
 DRIVER_PID=${!}
 
 tools/timebomb.zsh ${$} 15 ${OUTPUT} $0 &
@@ -20,11 +26,6 @@
 wait ${DRIVER_PID}
 kill ${BOMB_PID}
 
-N=$( grep -c "Normal exit" ${OUTPUT} )
-if (( N != 5 ))
-then
-  mv -v ${OUTPUT} ${OUTPUT}.failed
-  exit 1
-fi
+check_exits ${TOTAL} ${OUTPUT}
 
 return 0


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