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

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

Revision: 91
          http://c-mpi.svn.sourceforge.net/c-mpi/?rev=91&view=rev
Author:   jmwozniak
Date:     2010-05-11 21:36:05 +0000 (Tue, 11 May 2010)

Log Message:
-----------
Fix test-quit case

Modified Paths:
--------------
    test/driver/module.mk.in
    test/driver/test-quit.zsh
    test/driver/test-sleep.zsh
    tools/timebomb.zsh

Modified: test/driver/module.mk.in
===================================================================
--- test/driver/module.mk.in	2010-05-11 21:25:17 UTC (rev 90)
+++ test/driver/module.mk.in	2010-05-11 21:36:05 UTC (rev 91)
@@ -15,7 +15,6 @@
 TEST_OUTPUT += $(TEST_DRIVER_OUTPUT)
 
 TEST_DRIVER = test/driver/test_driver.x
-
 TEST_DRIVER_IMPL = test/driver/test_driver_fifo.o
 
 $(TEST_DRIVER): $(TEST_DRIVER_IMPL) test/driver/test_helpers.o $(CMPI)
@@ -28,6 +27,6 @@
 	$(Q) "  MPICC		$(@) "
 	$(E) $(MPICC) $(MPE) $(<) test/driver/test_helpers.o $(CMPI) $(LIBS) -o $(@)
 
-test/driver/test%.out: test/driver/test%.zsh test/driver/test02.x $(TEST_DRIVER)
+test/driver/test%.out: test/driver/test%.zsh $(TEST_PROGS) $(TEST_DRIVER)
 	$(Q) "  TEST		$(@) "
 	$(E) $(<) $(@)

Modified: test/driver/test-quit.zsh
===================================================================
--- test/driver/test-quit.zsh	2010-05-11 21:25:17 UTC (rev 90)
+++ test/driver/test-quit.zsh	2010-05-11 21:36:05 UTC (rev 91)
@@ -5,15 +5,15 @@
 mpiexec -n 5 test/driver/test_driver.x -n 4 > ${OUTPUT} &
 DRIVER_PID=${!}
 
-tools/timebomb.zsh ${$} 10 ${OUTPUT} $0
-BOMB1_PID=${!}
+tools/timebomb.zsh ${$} 10 ${OUTPUT} $0 &
+BOMB_PID=${!}
 
-sleep 5
+sleep 3
 
-print "Launching tool 02..."
-test/driver/test02.x
+test/driver/test-cmd-quit.x
 
-wait
+wait ${DRIVER_PID}
+kill ${BOMB_PID}
 
 N=$( grep -c "Normal exit" ${OUTPUT} )
 if (( N != 5 ))

Modified: test/driver/test-sleep.zsh
===================================================================
--- test/driver/test-sleep.zsh	2010-05-11 21:25:17 UTC (rev 90)
+++ test/driver/test-sleep.zsh	2010-05-11 21:36:05 UTC (rev 91)
@@ -1,20 +1,23 @@
 #!/bin/zsh
 
-make -j 3 D=1 test/driver/test02.x test/driver/test03.x \
-              test/driver/test_driver.x
-[[ $? != 0 ]] && exit
-sleep 1
-
-mpiexec -n 5 test/driver/test_driver.x -n 4 &
+mpiexec -n 5 test/driver/test_driver.x -n 4 > ${OUTPUT} &
 DRIVER_PID=${!}
 
+tools/timebomb.zsh ${$} 10 ${OUTPUT} $0
+BOMB1_PID=${!}
+
 sleep 5
 
-print "Launching tool 03..."
-test/driver/test03.x
+print "Launching command quit..."
+test/driver/test-cmd-quit.x
 
-print "Launching tool 02..."
-test/driver/test02.x
-
 wait
 
+N=$( grep -c "Normal exit" ${OUTPUT} )
+if (( N != 5 ))
+then
+  mv -v ${OUTPUT} ${OUTPUT}.failed
+  exit 1
+fi
+
+return 0

Modified: tools/timebomb.zsh
===================================================================
--- tools/timebomb.zsh	2010-05-11 21:25:17 UTC (rev 90)
+++ tools/timebomb.zsh	2010-05-11 21:36:05 UTC (rev 91)
@@ -14,4 +14,4 @@
 
 sleep 3
 
-kill ${TARGET}
+kill -9 ${TARGET}


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