[C-MPI-commits] SF.net SVN: c-mpi:[83] test
Status: Pre-Alpha
Brought to you by:
jmwozniak
Menu
▾
▴
[C-MPI-commits] SF.net SVN: c-mpi:[83] test
|
From: <jmw...@us...> - 2010-05-11 19:18:41
|
Revision: 83
http://c-mpi.svn.sourceforge.net/c-mpi/?rev=83&view=rev
Author: jmwozniak
Date: 2010-05-11 19:18:30 +0000 (Tue, 11 May 2010)
Log Message:
-----------
Improved testing framework.
Modified Paths:
--------------
Makefile.in
src/adts/module.mk.in
src/cmpi/driver.c
src/cmpi/module.mk.in
src/cmpi-cp/module.mk.in
src/dense-1/module.mk.in
src/gossip/module.mk.in
src/kda-2/module.mk.in
src/mpi_tools/module.mk.in
src/mpirpc/module.mk.in
test/adts/module.mk.in
test/cmpi/module.mk.in
test/gossip/module.mk.in
test/mpi_tools/module.mk.in
test/mpirpc/module.mk.in
Property Changed:
----------------
/
Property changes on:
___________________________________________________________________
Added: svn:ignore
+ .ignore
cmpi-config.h
cmpi-config.h.in
Makefile
lib
bin
Modified: Makefile.in
===================================================================
--- Makefile.in 2010-05-11 19:13:24 UTC (rev 82)
+++ Makefile.in 2010-05-11 19:18:30 UTC (rev 83)
@@ -129,8 +129,10 @@
# They are identified by the presence of module.mk files (makefile
# includes).
DIR :=
-MODULES := $(shell find . "(" -name gsl -prune -or -name "*.mk" ")" -a -type f )
+MODULES :=
+# $(shell find . "(" -name gsl -prune -or -name "*.mk" ")" -a -type f )
+
# List of directories to search for headers.
INCLUDES := include
@@ -254,16 +256,12 @@
# LIBSRC is source code for libcmpi
LIBSRC :=
-# Source code for MPIRPC
-MPIRPC_SRC :=
-# Source code for CMPI
-CMPI_SRC :=
# Source code for Kademlia
KDA_SRC :=
# Source code for Dense implementation
DENSE_SRC :=
# Source code for ADTs
-ADT_SRC :=
+ADTS_SRC :=
# Source code for DiskSim interface
DISKSIM_SRC :=
@@ -282,17 +280,17 @@
$(E)echo LIBS: $(LIBS)
$(E)echo DEPENDS: $(DEPENDS)
$(E)echo OPENSSL: $(OPENSSL_LOCATION)
- $(E)echo ADT_OBJS: $(ADT_OBJS)
-# $(E)echo USE_MPIRPC_1: @USE_MPIRPC_1@
-# $(E)echo USE_MPIRPC_2: @USE_MPIRPC_2@
-# $(E)echo USE_TABLE_KDA_1: @USE_TABLE_KDA_1@
+ $(E)echo GOSSIP_OBJS: $(GOSSIP_OBJS)
+ $(E)echo ADTS_OBJS: $(ADTS_OBJS)
+ $(E)echo MPITOOLS_OBJS: $(MPITOOLS_OBJS)
+ $(E)echo MPIRPC_OBJS: $(MPIRPC_OBJS)
# $(E)echo USE_TABLE_KDA_2A: @USE_TABLE_KDA_2A@
# $(E)echo USE_TABLE_KDA_2B: @USE_TABLE_KDA_2B@
-# $(E)echo USE_TABLE_DENSE_1: @USE_TABLE_DENSE_1@
+ $(E)echo USE_TABLE_DENSE_1: @USE_TABLE_DENSE_1@
# $(E)echo CMPI_SRC: $(CMPI_OBJS)
# $(E)echo CMPI_OBJS: $(CMPI_OBJS)
# $(E)echo TEST_CMPI_SRC: $(TEST_CMPI_SRC)
- $(E)echo TEST_DISKSIM_SRC: $(TEST_DISKSIM_SRC)
+# $(E)echo TEST_DISKSIM_SRC: $(TEST_DISKSIM_SRC)
# $(E)echo TEST_MPIRPC_SRC: $(TEST_MPIRPC_SRC)
$(E)echo TEST_SRC: $(TEST_SRC)
$(E)echo TEST_OBJS: $(TEST_OBJS)
@@ -302,8 +300,6 @@
$(Q) " "
# Shortcuts...
-CMPI := lib/libcmpi.a
-MPIRPC := lib/libmpirpc.a
CMPI_IO := lib/libcmpi-io.so
################################################################
@@ -311,14 +307,18 @@
# this is how we pull build information from all of the project
# subdirectories, make sure to catch top level module.mk as well
DIR :=
-include $(MODULES)
+# include $(MODULES)
-TEST_OBJS += $(patsubst %.c, %.o, $(TEST_SRC))
-TEST_PROGS += $(patsubst %.c, %.x, $(TEST_SRC))
-TEST_OUTPUT += $(patsubst %.c, %.out, $(TEST_SRC))
-TEST_DEPS += $(patsubst %.c, %.d, $(TEST_SRC))
-TEST_HELPER_OBJS += $(patsubst %.c, %.o, $(TEST_HELPER_SRC))
-TEST_DEPS += $(patsubst %.c, %.d, $(TEST_HELPER_SRC))
+# TABLE_OBJS :=
+include src/mpi_tools/module.mk
+include src/gossip/module.mk
+include src/adts/module.mk
+include src/mpirpc/module.mk
+include src/kda-2/module.mk
+include src/dense-1/module.mk
+include src/cmpi/module.mk
+#include src/cmpi-db/module.mk
+#include src/cmpi-cp/module.mk
################################################################
# Derived file lists
@@ -329,62 +329,66 @@
# by manipulating the lists of source files
# LIBOBJS is a list of objects to put in the client lib
-LIBOBJS := $(patsubst %.c,%.o, $(filter %.c,$(LIBSRC)))
+#LIBOBJS := $(patsubst %.c,%.o, $(filter %.c,$(LIBSRC)))
-ADT_OBJS := $(patsubst %.c,%.o, $(filter %.c,$(ADT_SRC)))
-DISKSIM_OBJS := $(patsubst %.c,%.o, $(filter %.c,$(DISKSIM_SRC)))
-MPIRPC_OBJS := $(patsubst %.c,%.o, $(filter %.c,$(MPIRPC_SRC)))
-MPIRPC_OBJS += $(ADT_OBJS)
-KDA_OBJS := $(patsubst %.c,%.o, $(filter %.c,$(KDA_SRC)))
-DENSE_OBJS := $(patsubst %.c,%.o, $(filter %.c,$(DENSE_SRC)))
-TABLE_OBJS := $(KDA_OBJS) $(DENSE_OBJS)
-CMPI_OBJS := $(patsubst %.c,%.o, $(filter %.c,$(CMPI_SRC)))
-CMPI_OBJS += $(TABLE_OBJS) $(MPIRPC_OBJS) $(DISKSIM_OBJS)
+#DISKSIM_OBJS := $(patsubst %.c,%.o, $(filter %.c,$(DISKSIM_SRC)))
+#TABLE_OBJS := $(KDA_OBJS) $(DENSE_OBJS)
+#CMPI_OBJS += $(TABLE_OBJS) $(MPIRPC_OBJS) $(DISKSIM_OBJS)
CMPI_DEPS := $(patsubst %.o,%.d,$(CMPI_OBJS))
+################################################################
+# Test cases
+# Test rules are heavily based on the definitions above
+
+TEST_SRC :=
+TEST_OBJS :=
+TEST_PROGS :=
+TEST_OUTPUT :=
+
+include test/mpi_tools/module.mk
+include test/gossip/module.mk
+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
+
+#TEST_HELPER_OBJS += $(patsubst %.c, %.o, $(TEST_HELPER_SRC))
+TEST_DEPS += $(patsubst %.c, %.d, $(TEST_SRC))
+TEST_DEPS += $(patsubst %.c, %.d, $(TEST_HELPER_SRC))
+
####################################################################
# Rules and dependencies
# default rule builds server, library, and applications
# all:: # $(SERVER) $(LIBRARIES)
-cmpi: $(CMPI)
+mpirpc: $(MPIRPC)
+cmpi: $(CMPI)
-cmpi-io: $(CMPI_IO)
+#cmpi-io: $(CMPI_IO)
-mpirpc: $(MPIRPC)
-
# Just like dir, but strip the slash off the end, to be pretty.
-dirname = $(patsubst %/,%,$(dir $(1)))
+# dirname = $(patsubst %/,%,$(dir $(1)))
# Generate the canonical in-tree location of a file, given a possibly
# out-of-tree reference.
-canonname = $(patsubst $(srcdir)/%,%,$(call dirname,$(1)))
+# canonname = $(patsubst $(srcdir)/%,%,$(call dirname,$(1)))
# Grab any CFLAGS defined by the make stub for a particular file, and
# for the directory in which the source resides.
-modcflags = $(MODCFLAGS_$(call canonname,$(1))) \
- $(MODCFLAGS_$(patsubst $(srcdir)/%,%,$(1))) # -I$(srcdir)/$(call dirname,$(1))
-modldflags = $(MODLDFLAGS_$(call canonname,$(1))) \
- $(MODLDFLAGS_$(patsubst $(srcdir)/%,%,$(1)))
+# modcflags = $(MODCFLAGS_$(call canonname,$(1))) \
+# $(MODCFLAGS_$(patsubst $(srcdir)/%,%,$(1))) # -I$(srcdir)/$(call dirname,$(1))
+# modldflags = $(MODLDFLAGS_$(call canonname,$(1))) \
+# $(MODLDFLAGS_$(patsubst $(srcdir)/%,%,$(1)))
-$(CMPI): $(CMPI_OBJS) $(TABLE_OBJS)
- $(Q) " AR $@"
- $(E)$(INSTALL) -d lib
- $(E)ar rcs $(@) $(CMPI_OBJS) $(TABLE_OBJS)
-
-$(MPIRPC): $(MPIRPC_OBJS)
- $(Q) " AR $@"
- $(E)$(INSTALL) -d lib
- echo $(MODULES)
- $(E)ar crs $(@) $(MPIRPC_OBJS)
-
# CMPI-IO must be enabled in configure --enable-cmpi-io
-$(CMPI_IO): $(CMPI) src/cmpi/cmpi-io.po
- $(Q) " MPICC [PIC] $@"
- $(E)$(INSTALL) -d lib
- $(E)$(MPICC) -shared $< $(CMPI) $(LIBS) -o $@
+#$(CMPI_IO): $(CMPI) src/cmpi/cmpi-io.po
+# $(Q) " MPICC [PIC] $@"
+# $(E)$(INSTALL) -d lib
+# $(E)$(MPICC) -shared $< $(CMPI) $(LIBS) -o $@
## Tools...
@@ -477,12 +481,13 @@
clean::
$(Q) " CLEAN"
$(E)rm -fv $(CMPI_DEPS) $(TEST_DEPS) \
- $(MPIRPC) $(CMPI) $(MPIRPC_OBJS) $(CMPI_OBJS) \
+ $(MPIRPC) $(CMPI) $(ADTS_OBJS) $(MPIRPC_OBJS) $(CMPI_OBJS) \
$(KDA_OBJS) $(CMPI_IO) $(CMPI_PICS) \
hex unhex hexord unpublish node driver \
$(TEST_OUTPUT) $(TEST_PROGS) $(TEST_OBJS) \
$(CMPI_PROGS) $(CMPI_CP_OBJS) splint.out
$(E)find . -name "*.failed" -exec rm -fv \{\} \;
+ $(E)find . -name "test-success.out" -exec rm -fv \{\} \;
# $(E)find . -name "*.avg" -exec rm -fv \{\} \;
# $(E)find . -name "*.per" -exec rm -fv \{\} \;
Modified: src/adts/module.mk.in
===================================================================
--- src/adts/module.mk.in 2010-05-11 19:13:24 UTC (rev 82)
+++ src/adts/module.mk.in 2010-05-11 19:18:30 UTC (rev 83)
@@ -1,16 +1,19 @@
DIR := src/adts
-ADT_SRC += $(DIR)/hashtable.c
-ADT_SRC += $(DIR)/keyvalue.c
-ADT_SRC += $(DIR)/itable.c
-ADT_SRC += $(DIR)/ltable.c
-ADT_SRC += $(DIR)/list.c
-ADT_SRC += $(DIR)/ilist.c
-ADT_SRC += $(DIR)/klist.c
-ADT_SRC += $(DIR)/llist.c
-ADT_SRC += $(DIR)/inlist.c
-ADT_SRC += $(DIR)/lnlist.c
-ADT_SRC += $(DIR)/dpkm_list.c
-ADT_SRC += $(DIR)/lru_table.c
-ADT_SRC += $(DIR)/xtree.c
+ADTS_SRC += $(DIR)/hashtable.c
+ADTS_SRC += $(DIR)/keyvalue.c
+ADTS_SRC += $(DIR)/itable.c
+ADTS_SRC += $(DIR)/ltable.c
+ADTS_SRC += $(DIR)/list.c
+ADTS_SRC += $(DIR)/ilist.c
+ADTS_SRC += $(DIR)/klist.c
+ADTS_SRC += $(DIR)/llist.c
+ADTS_SRC += $(DIR)/inlist.c
+ADTS_SRC += $(DIR)/lnlist.c
+ADTS_SRC += $(DIR)/dpkm_list.c
+ADTS_SRC += $(DIR)/lru_table.c
+ADTS_SRC += $(DIR)/xtree.c
+
+ADTS_OBJS = $(patsubst %.c, %.o, $(ADTS_SRC))
+ADTS_OBJS += $(GOSSIP_OBJS)
Modified: src/cmpi/driver.c
===================================================================
--- src/cmpi/driver.c 2010-05-11 19:13:24 UTC (rev 82)
+++ src/cmpi/driver.c 2010-05-11 19:18:30 UTC (rev 83)
@@ -142,7 +142,7 @@
int i;
sscanf(p, "%i", &i);
char* result = cmpi_info(i);
- printf(result);
+ printf("%s", result);
}
void
Modified: src/cmpi/module.mk.in
===================================================================
--- src/cmpi/module.mk.in 2010-05-11 19:13:24 UTC (rev 82)
+++ src/cmpi/module.mk.in 2010-05-11 19:18:30 UTC (rev 83)
@@ -1,22 +1,23 @@
DIR := src/cmpi
+CMPI_SRC :=
CMPI_SRC += $(DIR)/cmpi.c
CMPI_SRC += $(DIR)/node.c
CMPI_SRC += $(DIR)/driver.c
CMPI_SRC += $(DIR)/accessor.c
ifeq (@USE_TABLE_DENSE@,1)
- CMPI_SRC += $(DIR)/dense.c
- CMPI_SRC += $(DIR)/driver.c
-endif
+ CMPI_SRC += $(DIR)/dense.c
+ CMPI_SRC += $(DIR)/driver.c
+endif
ifeq (@USE_DRIVER@,1)
- CMPI_SRC += $(DIR)/driver.c
+ CMPI_SRC += $(DIR)/driver.c
endif
ifeq (@USE_CMPI_IO@,1)
- CMPI_SRC += $(DIR)/cmpi-io.c
+ CMPI_SRC += $(DIR)/cmpi-io.c
endif
ifeq (@USE_COMM_WORLD@,0)
@@ -30,3 +31,13 @@
ifeq (@USE_DISK_VOID@,1)
CMPI_SRC += $(DIR)/cmpi_disk_void.c
endif
+
+CMPI_OBJS = $(patsubst %.c, %.o, $(CMPI_SRC))
+CMPI_OBJS += $(MPIRPC_OBJS)
+
+CMPI = lib/libcmpi.a
+
+$(CMPI): $(CMPI_OBJS) $(TABLE_OBJS)
+ $(Q) " AR $@"
+ $(E)$(INSTALL) -d lib
+ $(E)ar rcs $(@) $(CMPI_OBJS) $(TABLE_OBJS)
Modified: src/cmpi-cp/module.mk.in
===================================================================
--- src/cmpi-cp/module.mk.in 2010-05-11 19:13:24 UTC (rev 82)
+++ src/cmpi-cp/module.mk.in 2010-05-11 19:18:30 UTC (rev 83)
@@ -1,19 +1,17 @@
-# CMPI-CP is not an MPI program
+# CMPI-CP is not an MPI program
DIR := src/cmpi-cp
-CMPI_PROGS += bin/cmpi-cp
-CMPI_CP_SRC += src/cmpi-cp/cmpi-cp.c
+CMPICP_PROGS += bin/cmpi-cp
+CMPICP_SRC += src/cmpi-cp/cmpi-cp.c
-CMPI_CP_OBJS = src/cmpi-cp/cmpi-cp.o src/cmpi/accessor.o src/mpi_tools/io_tools.o
+CMPICP_OBJS = src/cmpi-cp/cmpi-cp.o src/cmpi/accessor.o src/mpi_tools/io_tools.o
-CMPI_CP_LIBS :=
-
ifneq ($(DMALLOC_LIB),)
- CMPI_CP_LIBS += -L $(DMALLOC_LIB) -l dmalloc
+ CMPI_CP_LIBS += -L $(DMALLOC_LIB) -l dmalloc
endif
bin/cmpi-cp: $(CMPI_CP_OBJS) bin
- $(Q) " CC $(@) "
- $(E)$(CC) $(CMPI_CP_OBJS) $(CMPI_CP_LIBS) -o $(@)
+ $(Q) " CC $(@) "
+ $(E)$(CC) $(CMPI_CP_OBJS) -o $(@)
Modified: src/dense-1/module.mk.in
===================================================================
--- src/dense-1/module.mk.in 2010-05-11 19:13:24 UTC (rev 82)
+++ src/dense-1/module.mk.in 2010-05-11 19:18:30 UTC (rev 83)
@@ -4,4 +4,7 @@
ifeq (@USE_TABLE_DENSE_1@,1)
DENSE_SRC += $(DIR)/dense.c
DENSE_SRC += $(DIR)/cmpi_dense.c
-endif
+endif
+
+DENSE_OBJS := $(patsubst %.c, %.o, $(DENSE_SRC))
+TABLE_OBJS += $(DENSE_OBJS)
Modified: src/gossip/module.mk.in
===================================================================
--- src/gossip/module.mk.in 2010-05-11 19:13:24 UTC (rev 82)
+++ src/gossip/module.mk.in 2010-05-11 19:18:30 UTC (rev 83)
@@ -4,8 +4,11 @@
# outcome
DIR := src/gossip
-ADT_SRC += $(DIR)/gossip.c
+GOSSIP_SRC := $(DIR)/gossip.c
ifdef GOSSIP_ENABLE_BACKTRACE
MODCFLAGS_$(DIR)/gossip.c := -DGOSSIP_ENABLE_BACKTRACE
endif
+
+GOSSIP_OBJS = $(patsubst %.c, %.o, $(GOSSIP_SRC))
+GOSSIP_OBJS += $(MPITOOLS_OBJS)
Modified: src/kda-2/module.mk.in
===================================================================
--- src/kda-2/module.mk.in 2010-05-11 19:13:24 UTC (rev 82)
+++ src/kda-2/module.mk.in 2010-05-11 19:18:30 UTC (rev 83)
@@ -22,3 +22,6 @@
ifeq (@USE_TABLE_KDA_2B@,1)
KDA_SRC += $(DIR)/conn-B.c
endif
+
+KDA_OBJS := $(patsubst %.c,%.o, $(KDA_SRC))
+TABLE_OBJS += $(KDA_OBJS)
Modified: src/mpi_tools/module.mk.in
===================================================================
--- src/mpi_tools/module.mk.in 2010-05-11 19:13:24 UTC (rev 82)
+++ src/mpi_tools/module.mk.in 2010-05-11 19:18:30 UTC (rev 83)
@@ -1,5 +1,8 @@
DIR := src/mpi_tools
-MPIRPC_SRC += $(DIR)/mpi_tools.c
-MPIRPC_SRC += $(DIR)/io_tools.c
+MPITOOLS_SRC :=
+MPITOOLS_SRC += $(DIR)/mpi_tools.c
+MPITOOLS_SRC += $(DIR)/io_tools.c
+
+MPITOOLS_OBJS = $(patsubst %.c, %.o, $(MPITOOLS_SRC))
Modified: src/mpirpc/module.mk.in
===================================================================
--- src/mpirpc/module.mk.in 2010-05-11 19:13:24 UTC (rev 82)
+++ src/mpirpc/module.mk.in 2010-05-11 19:18:30 UTC (rev 83)
@@ -1,4 +1,14 @@
DIR := src/mpirpc
-MPIRPC_SRC += $(DIR)/mpirpc.c
+MPIRPC_SRC := $(DIR)/mpirpc.c
+
+MPIRPC_OBJS := $(patsubst %.c, %.o, $(MPIRPC_SRC))
+MPIRPC_OBJS += $(ADTS_OBJS)
+
+MPIRPC = lib/libmpirpc.a
+
+lib/libmpirpc.a: $(MPIRPC_OBJS)
+ $(Q) " AR $@"
+ $(E)$(INSTALL) -d lib
+ $(E)ar crs $(@) $(MPIRPC_OBJS)
Modified: test/adts/module.mk.in
===================================================================
--- test/adts/module.mk.in 2010-05-11 19:13:24 UTC (rev 82)
+++ test/adts/module.mk.in 2010-05-11 19:18:30 UTC (rev 83)
@@ -1,10 +1,24 @@
-TEST_SRC += $(shell find test/adts -name "*.c")
+DIR := test/adts
-test/adts/test%.x: test/adts/test%.o src/mpi_tools/mpi_tools.o $(CMPI)
+TEST_ADTS_SRC += $(shell find $(DIR) -name "*.c")
+TEST_ADTS_OBJS = $(patsubst %.c, %.o, $(TEST_ADTS_SRC))
+TEST_ADTS_OUTPUT = $(patsubst %.c, %.out, $(TEST_ADTS_SRC))
+
+TEST_SRC += $(TEST_ADTS_SRC)
+TEST_OBJS += $(TEST_ADTS_OBJS)
+TEST_OUTPUT += $(TEST_ADTS_OUTPUT)
+TEST_PROGS += $(patsubst %.c, %.x, $(TEST_ADTS_SRC))
+
+$(DIR)/test%.x: $(DIR)/test%.o $(ADTS_OBJS)
$(Q) " LINK $(@) "
- $(E)$(MPICC) $(MPE) $(<) src/mpi_tools/mpi_tools.o $(ADT_OBJS) $(LIBS) -o $(@)
+ $(E) $(MPICC) $(MPE) $(<) $(ADTS_OBJS) $(LIBS) -o $(@)
-test/adts/test%.out: test/adts/test%.x
+$(DIR)/test%.out: $(DIR)/test%.x
$(Q) " TEST $(@) "
- $(E)$(<) > $(@) 2>&1
+ $(E) test/adts/runtest.zsh $(<) $(@) 2>&1
+
+$(DIR)/test-success.out: test/gossip/test-success.out \
+ $(TEST_ADTS_OUTPUT)
+ $(Q) " TOUCH $(@) "
+ $(E) touch $(@)
Modified: test/cmpi/module.mk.in
===================================================================
--- test/cmpi/module.mk.in 2010-05-11 19:13:24 UTC (rev 82)
+++ test/cmpi/module.mk.in 2010-05-11 19:18:30 UTC (rev 83)
@@ -1,33 +1,39 @@
-# Run tests with, e.g.,
-# make SIZE=4 NODES=3 REPS=5 test/cmpi/test01.out
-# SIZE is the size of the whole system (nodes+clients)
-# NODES is the number of nodes
-# REPS determines the length of tests that repeat operations
+DIR := test/cmpi
-# Be sure to include at least one client so that cmpi_client_code()
-# is actually called.
-
TEST_CMPI_SRC += $(shell find test/cmpi -name "*.c" ! -name test_helpers.c)
-TEST_SRC += $(TEST_CMPI_SRC)
-TEST_HELPER_SRC += test/cmpi/test_helpers.c
+TEST_CMPI_OBJS = $(patsubst %.c, %.o, $(TEST_CMPI_SRC))
+TEST_CMPI_OUTPUT = $(patsubst %.c, %.out, $(TEST_CMPI_SRC))
+TEST_HELPER_SRC := test/cmpi/test_helpers.c
+TEST_CMPI_OBJS += $(patsubst %.c, %.o, $(TEST_HELPER_SRC))
+
+TEST_SRC += $(TEST_CMPI_SRC)
+TEST_OBJS += $(TEST_CMPI_OBJS)
+TEST_PROGS += $(patsubst %.c, %.x, $(TEST_CMPI_SRC))
+TEST_OUTPUT += $(TEST_CMPI_OUTPUT)
+
ifeq (@USE_COMM_WORLD@,1)
-test/cmpi/test%.out: test/cmpi/test%.x test/cmpi/test%.zsh
- $(E) $(MPDCHECK)
- $(Q) " TEST $(@) "
- $(E) $(patsubst %.x, %.zsh, $(<)) $(<) $(LAUNCH)
-
-test/cmpi/test%.x: test/cmpi/test%.o test/cmpi/test_helpers.o src/cmpi/node.o $(CMPI)
+$(DIR)/test%.x: $(DIR)/test%.o $(DIR)/test_helpers.o src/cmpi/node.o $(CMPI)
$(Q) " LINK $(@) "
- $(E) $(MPICC) $(MPE) $(<) test/cmpi/test_helpers.o src/cmpi/node.o \
+ $(E) $(MPICC) $(MPE) $(<) $(DIR)/test_helpers.o src/cmpi/node.o \
$(CMPI) $(LIBS) -o $(@)
else
-test/cmpi/test%.x: test/cmpi/test%.o test/cmpi/test_helpers.o src/cmpi/client.o $(CMPI)
+$(DIR)/test%.x: $(DIR)/test%.o $(DIR)/test_helpers.o src/cmpi/client.o $(CMPI)
$(Q) " LINK $(@) "
- $(E)$(MPICC) $(MPE) $(<) test/cmpi/test_helpers.o src/cmpi/client.o $(CMPI) $(LIBS) -o $(@)
+ $(E)$(MPICC) $(MPE) $(<) $(DIR)/test_helpers.o src/cmpi/client.o $(CMPI) $(LIBS) -o $(@)
endif
+
+$(DIR)/test%.out: $(DIR)/test%.x $(DIR)/test%.zsh
+ $(E) $(MPDCHECK)
+ $(Q) " TEST $(@) "
+ $(E) $(patsubst %.x, %.zsh, $(<)) $(<) $(LAUNCH)
+
+$(DIR)/test-success.out: test/mpirpc/test-success.out \
+ $(TEST_CMPI_OUTPUT)
+ $(Q) " TOUCH $(@) "
+ $(E) touch $(@)
Modified: test/gossip/module.mk.in
===================================================================
--- test/gossip/module.mk.in 2010-05-11 19:13:24 UTC (rev 82)
+++ test/gossip/module.mk.in 2010-05-11 19:18:30 UTC (rev 83)
@@ -1,12 +1,22 @@
DIR := test/gossip
-TEST_SRC += $(shell find $(DIR) -name "*.c")
+TEST_GOSSIP_SRC += $(shell find $(DIR) -name "*.c")
+TEST_GOSSIP_OBJS += $(patsubst %.c, %.o, $(TEST_GOSSIP_SRC))
+TEST_PROGS += $(patsubst %.c, %.x, $(TEST_GOSSIP_SRC))
+TEST_GOSSIP_OUTPUT = $(patsubst %.c, %.out, $(TEST_GOSSIP_SRC))
+TEST_OBJS += $(TEST_GOSSIP_OBJS)
+TEST_OUTPUT += $(TEST_GOSSIP_OUTPUT)
-$(DIR)/test%.x: $(DIR)/test%.o $(CMPI)
+$(DIR)/test%.x: $(DIR)/test%.o $(GOSSIP_OBJS)
$(Q) " LINK $(@) "
- $(E)$(MPICC) $(<) $(CMPI) $(LIBS) -o $(@)
+ $(E)$(MPICC) $(<) $(GOSSIP_OBJS) $(LIBS) -o $(@)
$(DIR)/test%.out: $(DIR)/test%.x
$(Q) " TEST $(@) "
$(E)$(patsubst %.x, %.zsh, $(<)) $(<)
+
+$(DIR)/test-success.out: test/mpi_tools/test-success.out \
+ $(TEST_GOSSIP_OUTPUT)
+ $(Q) " TOUCH $(@) "
+ $(E) touch $(@)
Modified: test/mpi_tools/module.mk.in
===================================================================
--- test/mpi_tools/module.mk.in 2010-05-11 19:13:24 UTC (rev 82)
+++ test/mpi_tools/module.mk.in 2010-05-11 19:18:30 UTC (rev 83)
@@ -1,11 +1,23 @@
-TEST_MPITOOLS_SRC += $(shell find test/mpi_tools -name "*.c")
-TEST_SRC += $(TEST_MPITOOLS_SRC)
+DIR := test/mpi_tools
-test/mpi_tools/test%.out: test/mpi_tools/test%.x
+TEST_MPITOOLS_SRC = $(shell find $(DIR) -name "*.c")
+TEST_MPITOOLS_OBJS = $(patsubst %.c, %.o, $(TEST_MPITOOLS_SRC))
+TEST_MPITOOLS_OUTPUT = $(patsubst %.c, %.out, $(TEST_MPITOOLS_SRC))
+
+TEST_SRC += $(TEST_MPITOOLS_SRC)
+TEST_OBJS += $(TEST_MPITOOLS_OBJS)
+TEST_OUTPUT += $(TEST_MPITOOLS_OUTPUT)
+TEST_PROGS += $(patsubst %.c, %.x, $(TEST_MPITOOLS_SRC))
+
+$(DIR)/test%.out: test/mpi_tools/test%.x
$(Q) " TEST $(@) "
$(E)$(LAUNCH) -n 3 $(<) > $(@) 2>&1
-test/mpi_tools/test%.x: test/mpi_tools/test%.o $(CMPI)
+$(DIR)/test%.x: test/mpi_tools/test%.o $(MPITOOLS_OBJS)
$(Q) " MPICC $(@) "
- $(E)$(MPICC) $(MPE) $(<) $(CMPI) $(LIBS) -o $(@)
+ $(E)$(MPICC) $(MPE) $(<) $(MPITOOLS_OBJS) $(LIBS) -o $(@)
+
+$(DIR)/test-success.out: $(TEST_MPITOOLS_OUTPUT)
+ $(Q) " TOUCH $(@) "
+ $(E) touch $(@)
Modified: test/mpirpc/module.mk.in
===================================================================
--- test/mpirpc/module.mk.in 2010-05-11 19:13:24 UTC (rev 82)
+++ test/mpirpc/module.mk.in 2010-05-11 19:18:30 UTC (rev 83)
@@ -1,20 +1,25 @@
DIR := test/mpirpc
-# Tests require NODES and REPS variables
-# Usage: make D=1 NODES=2 REPS=1 test/mpirpc/test01.out
+TEST_MPIRPC_SRC += $(shell find $(DIR) -name "*.c")
+TEST_MPIRPC_OBJS = $(patsubst %.c, %.o, $(TEST_MPIRPC_SRC))
+TEST_MPIRPC_OUTPUT = $(patsubst %.c, %.out, $(TEST_MPIRPC_SRC))
-TEST_MPIRPC_SRC += $(shell find $(DIR) -name "*.c" )
-TEST_SRC += $(TEST_MPIRPC_SRC)
-TEST_STATUS += $(DIR)/test02.status
-TEST_OUTPUT += $(patsubst %.c, %.out, $(TEST_MPIRPC_SRC))
+TEST_SRC += $(TEST_MPIRPC_SRC)
+TEST_OBJS += $(TEST_MPIRPC_OBJS)
+TEST_PROGS += $(patsubst %.c, %.x, $(TEST_MPIRPC_SRC))
+TEST_OUTPUT += $(TEST_MPIRPC_OUTPUT)
-test/mpirpc/test%.out: test/mpirpc/test%.x
+$(DIR)/test%.x: $(DIR)/test%.o lib/libmpirpc.a
+ $(Q) " LINK $(@) "
+ $(E) $(MPICC) $(MPE) $(<) lib/libmpirpc.a $(LIBS) -o $(@)
+
+$(DIR)/test%.out: $(DIR)/test%.x
$(Q) " TEST $(@) "
$(E) $(MPDCHECK)
$(E) $(patsubst %.x, %.zsh, $(<)) $(<) $(LAUNCH)
-# cp -uv $(@) test/mpirpc/readable.txt
-$(DIR)/test%.x: $(DIR)/test%.o $(CMPI)
- $(Q) " MPICC $(@) "
- $(E)$(MPICC) $(MPE) $(<) $(CMPI) $(LIBS) -o $(@)
+$(DIR)/test-success.out: test/adts/test-success.out \
+ $(TEST_MPIRPC_OUTPUT)
+ $(Q) " TOUCH $(@) "
+ $(E) touch $(@)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
