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

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

Revision: 96
          http://c-mpi.svn.sourceforge.net/c-mpi/?rev=96&view=rev
Author:   jmwozniak
Date:     2010-05-12 00:16:31 +0000 (Wed, 12 May 2010)

Log Message:
-----------
Minor improvements to cmpi-db/cmpi-cp tests

Modified Paths:
--------------
    Makefile.in
    src/cmpi-cp/module.mk.in
    src/cmpi-db/module.mk.in
    test/cmpi-db/module.mk.in
    test/cmpi-db/test-cp1.zsh

Modified: Makefile.in
===================================================================
--- Makefile.in	2010-05-12 00:00:53 UTC (rev 95)
+++ Makefile.in	2010-05-12 00:16:31 UTC (rev 96)
@@ -309,7 +309,7 @@
 DIR :=
 # include $(MODULES)
 
-# TABLE_OBJS :=
+TABLE_OBJS :=
 include src/mpi_tools/module.mk
 include src/gossip/module.mk
 include src/adts/module.mk
@@ -318,7 +318,7 @@
 include src/dense-1/module.mk
 include src/cmpi/module.mk
 include src/cmpi-db/module.mk
-#include src/cmpi-cp/module.mk
+include src/cmpi-cp/module.mk
 
 ################################################################
 # Derived file lists
@@ -351,9 +351,9 @@
 include test/adts/module.mk
 include test/mpirpc/module.mk
 include test/cmpi/module.mk
-include test/driver/module.mk.in
-#include test/cmpi-db/module.mk.in
-#include test/cmpi-io/module.mk.in
+include test/driver/module.mk
+include test/cmpi-db/module.mk
+#include test/cmpi-io/module.mk
 
 #TEST_HELPER_OBJS += $(patsubst  %.c, %.o, $(TEST_HELPER_SRC))
 TEST_DEPS   += $(patsubst %.c,  %.d,   $(TEST_SRC))

Modified: src/cmpi-cp/module.mk.in
===================================================================
--- src/cmpi-cp/module.mk.in	2010-05-12 00:00:53 UTC (rev 95)
+++ src/cmpi-cp/module.mk.in	2010-05-12 00:16:31 UTC (rev 96)
@@ -12,6 +12,7 @@
 	CMPI_CP_LIBS += -L $(DMALLOC_LIB) -l dmalloc
 endif
 
-bin/cmpi-cp: $(CMPI_CP_OBJS) bin
+bin/cmpi-cp: $(CMPICP_OBJS)
 	$(Q) "  CC		$(@) "
-	$(E)$(CC) $(CMPI_CP_OBJS) -o $(@)
+	$(E) install -d bin
+	$(E) $(CC) $(CMPICP_OBJS) -o $(@)

Modified: src/cmpi-db/module.mk.in
===================================================================
--- src/cmpi-db/module.mk.in	2010-05-12 00:00:53 UTC (rev 95)
+++ src/cmpi-db/module.mk.in	2010-05-12 00:16:31 UTC (rev 96)
@@ -2,16 +2,17 @@
 DIR := src/cmpi-db
 
 PROGS  += bin/cmpi-db
-PROGS  += bin/cmpi-db-fifo-quit
-CMPIDB_SRC += src/cmpi-cp/cmpi-cp.c src/cmpi-db/cmpi-db-fifo-quit.c
+PROGS  += bin/cmpi-db-quit
+CMPIDB_SRC += src/cmpi-db/cmpi-db-fifo-quit.c
 
 CMPIDB = bin/cmpi-db
 
-$(CMPI_DB): src/cmpi-db/cmpi-db-fifo.o $(CMPI) bin
+$(CMPIDB): src/cmpi-db/cmpi-db-fifo.o $(CMPI)
 	$(Q) "  MPICC		$(@)"
-	$(E)$(MPICC) $(MPE) src/cmpi/node.o src/cmpi/driver.o \
+	$(E) install -d bin
+	$(E) $(MPICC) $(MPE) src/cmpi/node.o src/cmpi/driver.o \
                      $(<) $(CMPI) $(LIBS) -o $(@)
 
-bin/cmpi-db-fifo-quit: src/cmpi-db/cmpi-db-fifo-quit.o $(CMPI) bin
+bin/cmpi-db-quit: src/cmpi-db/cmpi-db-fifo-quit.o $(CMPI) bin
 	$(Q) "  MPICC		$(@)"
-	$(E)$(MPICC) $(<) $(CMPI) -o $(@)
+	$(E) $(MPICC) $(<) $(CMPI) -o $(@)

Modified: test/cmpi-db/module.mk.in
===================================================================
--- test/cmpi-db/module.mk.in	2010-05-12 00:00:53 UTC (rev 95)
+++ test/cmpi-db/module.mk.in	2010-05-12 00:16:31 UTC (rev 96)
@@ -1,18 +1,18 @@
 
-TEST_CMPI_DB_SRC += # $(shell find test/cmpi-db -name "*.c" ! -name test_helpers.c)
-TEST_SRC         += $(TEST_CMPI_DB_SRC)
-TEST_HELPER_SRC  += test/driver/test_helpers.c
+TEST_CMPIDB_ZSH = $(shell find test/cmpi-db -name "*.zsh")
+TEST_CMPIDB_OUTPUT = $(patsubst %.zsh, %.out, $(TEST_CMPIDB_ZSH))
 
-CMPI_DB = bin/cmpi-db
-CMPI_CP = bin/cmpi-cp
-CMPI_DB_QUIT = bin/cmpi-db-fifo-quit
-CMPI_DB_TOOLS = $(CMPI_DB) $(CMPI_CP) $(CMPI_DB_QUIT)
+TEST_OUTPUT += $(TEST_CMPIDB_OUTPUT)
 
-test/cmpi-db/test-%.out: test/cmpi-db/test-%.zsh $(CMPI_DB_TOOLS)
+CMPIDB = bin/cmpi-db
+CMPICP = bin/cmpi-cp
+CMPIDBQUIT = bin/cmpi-db-quit
+CMPIDB_TOOLS = $(CMPIDB) $(CMPICP) $(CMPIDBQUIT)
+
+test/cmpi-db/test-%.out: test/cmpi-db/test-%.zsh $(CMPIDB_TOOLS)
 	$(Q) "  TEST		$(@) "
 	$(E) $(MPDCHECK)
 	$(E) $(<) $(@) 4 3
-# test/cmpi-db/test-quit.zsh
 
 #test/cmpi-db/test%.out: test/cmpi-db/test%.x $(DRIVER)
 #	$(Q) "  TEST		$(@) "

Modified: test/cmpi-db/test-cp1.zsh
===================================================================
--- test/cmpi-db/test-cp1.zsh	2010-05-12 00:00:53 UTC (rev 95)
+++ test/cmpi-db/test-cp1.zsh	2010-05-12 00:16:31 UTC (rev 96)
@@ -38,7 +38,7 @@
 
 echo retrieved
 
-bin/cmpi-db-fifo-quit >& /dev/null &
+bin/cmpi-db-quit >& /dev/null &
 QUIT_PROCESS=$!
 
 sleep ${PROCS}
@@ -47,6 +47,6 @@
 N=$( grep -c "Normal exit." ${OUTPUT} )
 (( N == PROCS )) || crash "N != ${PROCS}"
 
-# rm cmpi-cp.out test-cp1.*.data
+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.