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

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

Revision: 97
          http://c-mpi.svn.sourceforge.net/c-mpi/?rev=97&view=rev
Author:   jmwozniak
Date:     2010-05-12 01:53:59 +0000 (Wed, 12 May 2010)

Log Message:
-----------
Fixes to driver and cmpi-db tests

Modified Paths:
--------------
    configure.ac
    src/cmpi/driver.c
    src/cmpi-db/module.mk.in
    test/cmpi-db/module.mk.in
    test/cmpi-db/test-cp1.zsh

Modified: configure.ac
===================================================================
--- configure.ac	2010-05-12 00:16:31 UTC (rev 96)
+++ configure.ac	2010-05-12 01:53:59 UTC (rev 97)
@@ -398,6 +398,7 @@
 	test/adts/module.mk
   	test/cmpi/module.mk
   	test/cmpi-db/module.mk
+  	test/driver/module.mk
   	test/gossip/module.mk
   	test/mpirpc/module.mk
   	test/mpi_tools/module.mk

Modified: src/cmpi/driver.c
===================================================================
--- src/cmpi/driver.c	2010-05-12 00:16:31 UTC (rev 96)
+++ src/cmpi/driver.c	2010-05-12 01:53:59 UTC (rev 97)
@@ -127,6 +127,7 @@
   }
   else
   {
+    printf("driver: length: %i\n", length);
     fprintf(driver->sink, "%i\n", length);
     fflush(driver->sink);
     buffer_to_stream(value, length, driver->sink);

Modified: src/cmpi-db/module.mk.in
===================================================================
--- src/cmpi-db/module.mk.in	2010-05-12 00:16:31 UTC (rev 96)
+++ src/cmpi-db/module.mk.in	2010-05-12 01:53:59 UTC (rev 97)
@@ -8,11 +8,11 @@
 CMPIDB = bin/cmpi-db
 
 $(CMPIDB): src/cmpi-db/cmpi-db-fifo.o $(CMPI)
-	$(Q) "  MPICC		$(@)"
+	$(Q) "  LINK		$(@)"
 	$(E) install -d bin
 	$(E) $(MPICC) $(MPE) src/cmpi/node.o src/cmpi/driver.o \
                      $(<) $(CMPI) $(LIBS) -o $(@)
 
 bin/cmpi-db-quit: src/cmpi-db/cmpi-db-fifo-quit.o $(CMPI) bin
-	$(Q) "  MPICC		$(@)"
+	$(Q) "  LINK		$(@)"
 	$(E) $(MPICC) $(<) $(CMPI) -o $(@)

Modified: test/cmpi-db/module.mk.in
===================================================================
--- test/cmpi-db/module.mk.in	2010-05-12 00:16:31 UTC (rev 96)
+++ test/cmpi-db/module.mk.in	2010-05-12 01:53:59 UTC (rev 97)
@@ -13,11 +13,3 @@
 	$(Q) "  TEST		$(@) "
 	$(E) $(MPDCHECK)
 	$(E) $(<) $(@) 4 3
-
-#test/cmpi-db/test%.out: test/cmpi-db/test%.x $(DRIVER)
-#	$(Q) "  TEST		$(@) "
-#	$(E)touch $(@)
-
-# $(DRIVER): $(DRIVER_IMPL) test/driver/test_helpers.o src/cmpi/node.o $(CMPI)
-# 	$(E)$(MPICC) $(MPE) $(<) test/driver/test_helpers.o src/cmpi/node.o \
-#                             $(CMPI) $(LIBS) -o $(@)

Modified: test/cmpi-db/test-cp1.zsh
===================================================================
--- test/cmpi-db/test-cp1.zsh	2010-05-12 00:16:31 UTC (rev 96)
+++ test/cmpi-db/test-cp1.zsh	2010-05-12 01:53:59 UTC (rev 97)
@@ -11,8 +11,11 @@
 source tools/test-helpers.zsh
 
 mpiexec -n ${PROCS} bin/cmpi-db -n ${NODES} >& ${OUTPUT} &
-MPI_PROCESS=$!
+DB_PID=${!}
 
+tools/timebomb.zsh ${DB_PID} $(( PROCS*3 )) ${OUTPUT} $0 &
+BOMB_PID=${!}
+
 sleep ${PROCS}
 
 echo "DATA" > test-cp1.input.data
@@ -25,8 +28,6 @@
   crash "cmpi-cp error!"
 fi
 
-echo inserted
-
 echo "\n\ncmpi-cp retrieve" >>& cmpi-cp.out
 bin/cmpi-cp dht://test-cp1 test-cp1.output.data >>& cmpi-cp.out
 if [[ $? != 0 ]]
@@ -36,8 +37,6 @@
   crash "cmpi-cp error!"
 fi
 
-echo retrieved
-
 bin/cmpi-db-quit >& /dev/null &
 QUIT_PROCESS=$!
 
@@ -47,6 +46,8 @@
 N=$( grep -c "Normal exit." ${OUTPUT} )
 (( N == PROCS )) || crash "N != ${PROCS}"
 
+kill ${BOMB_PID}
+
 rm -f cmpi-cp.out test-cp1.*.data
 
 exit 0


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