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

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

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

Log Message:
-----------
Simplify test/driver framework

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-18 18:17:40 UTC (rev 129)
+++ test/driver/module.mk.in	2010-05-18 18:18:08 UTC (rev 130)
@@ -43,7 +43,7 @@
 
 test/driver/test%.out: test/driver/test%.zsh $(TEST_PROGS) $(TEST_DRIVER)
 	$(Q) "  TEST		$(@) "
-	$(E) $(<) $(@) $(NODES) $(CLIENTS)
+	$(E) test/driver/test.zsh $(@) $(NODES) $(CLIENTS) $(<) $(CMPI_OPTS)
 
 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-18 18:17:40 UTC (rev 129)
+++ test/driver/test-get.zsh	2010-05-18 18:18:08 UTC (rev 130)
@@ -1,38 +1,5 @@
-#!/bin/zsh
-
-# Put/get case
-
-OUTPUT=$1
-NODES=$2
-CLIENTS=$3
-
-TOTAL=$(( NODES+CLIENTS ))
-
-source tools/test-helpers.zsh
-
-bail()
-{
-  kill ${BOMB_PID}
-  crash $1
-}
-
-mpiexec -n ${TOTAL} test/driver/test_driver.x -n ${NODES} > ${OUTPUT} &
-DRIVER_PID=${!}
-
-tools/timebomb.zsh ${$} 10 ${OUTPUT} $0 &
-BOMB_PID=${!}
-
-sleep 5
-
 test/driver/test-cmd-put.x sample-key
 test/driver/test-cmd-sleep.x 1
 test/driver/test-cmd-get.x sample-key
 [[ $? == 0 ]] || bail "could not get: sample-key"
 test/driver/test-cmd-quit.x
-
-wait ${DRIVER_PID}
-kill ${BOMB_PID}
-
-check_exits ${TOTAL} ${OUTPUT}
-
-return 0

Modified: test/driver/test-put.zsh
===================================================================
--- test/driver/test-put.zsh	2010-05-18 18:17:40 UTC (rev 129)
+++ test/driver/test-put.zsh	2010-05-18 18:18:08 UTC (rev 130)
@@ -1,30 +1,3 @@
-#!/bin/zsh
-
-# Just do a put
-
-OUTPUT=$1
-NODES=$2
-CLIENTS=$3
-
-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 &
-BOMB_PID=${!}
-
-sleep 5
-
 test/driver/test-cmd-put.x sample-key
 test/driver/test-cmd-sleep.x 1
 test/driver/test-cmd-quit.x
-
-wait ${DRIVER_PID}
-kill ${BOMB_PID}
-
-check_exits ${TOTAL} ${OUTPUT}
-
-return 0

Modified: test/driver/test-quit.zsh
===================================================================
--- test/driver/test-quit.zsh	2010-05-18 18:17:40 UTC (rev 129)
+++ test/driver/test-quit.zsh	2010-05-18 18:18:08 UTC (rev 130)
@@ -1,26 +1 @@
-#!/bin/zsh
-
-OUTPUT=$1
-NODES=$2
-CLIENTS=$3
-
-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 &
-BOMB_PID=${!}
-
-sleep 3
-
 test/driver/test-cmd-quit.x
-
-wait ${DRIVER_PID}
-kill ${BOMB_PID}
-
-check_exits ${TOTAL} ${OUTPUT}
-
-return 0

Modified: test/driver/test-sleep.zsh
===================================================================
--- test/driver/test-sleep.zsh	2010-05-18 18:17:40 UTC (rev 129)
+++ test/driver/test-sleep.zsh	2010-05-18 18:18:08 UTC (rev 130)
@@ -1,31 +1,4 @@
-#!/bin/zsh
-
-# Flex driver by issuing simple commands
-
-OUTPUT=$1
-NODES=$2
-CLIENTS=$3
-
-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 &
-BOMB_PID=${!}
-
-sleep 5
-
 test/driver/test-cmd-sleep.x 1
 test/driver/test-cmd-sleep.x 1
 test/driver/test-cmd-sleep.x 1
 test/driver/test-cmd-quit.x
-
-wait ${DRIVER_PID}
-kill ${BOMB_PID}
-
-check_exits ${TOTAL} ${OUTPUT}
-
-return 0


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