[C-MPI-commits] SF.net SVN: c-mpi:[67] test
Status: Pre-Alpha
Brought to you by:
jmwozniak
Menu
▾
▴
[C-MPI-commits] SF.net SVN: c-mpi:[67] test
|
From: <jmw...@us...> - 2010-05-05 15:56:31
|
Revision: 67
http://c-mpi.svn.sourceforge.net/c-mpi/?rev=67&view=rev
Author: jmwozniak
Date: 2010-05-05 15:56:25 +0000 (Wed, 05 May 2010)
Log Message:
-----------
Test fixes.
Modified Paths:
--------------
Makefile.in
configure.ac
test/adts/module.mk.in
test/driver/module.mk.in
test/gossip/module.mk.in
test/gossip/test-do.zsh
test/gossip/test-env.zsh
test/gossip/test-masks.zsh
test/mpi_tools/module.mk.in
Modified: Makefile.in
===================================================================
--- Makefile.in 2010-05-04 18:46:20 UTC (rev 66)
+++ Makefile.in 2010-05-05 15:56:25 UTC (rev 67)
@@ -6,6 +6,7 @@
# cleaner cleans up configure-created files
# distclean _really_ cleans up; returns to pristine tree
# tags generates etags file for use by editors
+# test_results run all tests
# INPUT CONTROL VARIABLES
# D : if 1, turn on debugging output in CMPI programs
@@ -428,9 +429,9 @@
tests: $(CMPI) $(TEST_PROGS)
# Obsolete target: delete soon.
-cmpi-io-test: $(CMPI_IO) src/cmpi/cmpi-io-test.o
- $(Q) " MPICC cmpi-io-test"
- $(E)$(MPICC) src/cmpi/cmpi-io-test.o $(CMPI) $(LIBS) -o cmpi-io-test
+#cmpi-io-test: $(CMPI_IO) src/cmpi/cmpi-io-test.o
+# $(Q) " MPICC cmpi-io-test"
+# $(E)$(MPICC) src/cmpi/cmpi-io-test.o $(CMPI) $(LIBS) -o cmpi-io-test
# override default rule for building objects
%.o : %.c
@@ -503,8 +504,8 @@
aclocal.m4 \
config.h.in \
autoscan.log \
- configure.scan \
- cmpi-config.h*
+ configure.scan \
+ Makefile
$(E)find . -name "*.i" -exec rm -fv \{\} \;
$(E)find . -name "*.d" -exec rm -fv \{\} \;
$(E)find . -name "module.mk" -exec rm -fv \{\} \;
@@ -514,9 +515,7 @@
# except, don't remove generated .c files if this is a distributed release
distclean: cleaner docsclean
$(Q) " DISTCLEAN"
- $(E)rm -fv Makefile config.h \
- src/server/simple.conf \
- src/apps/admin/pvfs2-config
+ $(E)rm -fv configure config.h cmpi-config.h*
$(E)find . -name "*.dat" -exec rm -fv \{\} \;
# this is where we include all of our automatic dependencies.
Modified: configure.ac
===================================================================
--- configure.ac 2010-05-04 18:46:20 UTC (rev 66)
+++ configure.ac 2010-05-05 15:56:25 UTC (rev 67)
@@ -380,28 +380,33 @@
dnl output final version of top level makefile and subdirectory
dnl makefile includes
-AC_CONFIG_FILES(Makefile
-src/gossip/module.mk
-src/adts/module.mk
-src/cmpi/module.mk
-src/cmpi-cp/module.mk
-src/cmpi-db/module.mk
-src/mpi_tools/module.mk
-src/mpirpc/module.mk
-src/dense-1/module.mk
-src/kda-2/module.mk
-)
+AC_CONFIG_FILES(
+ Makefile
+ src/gossip/module.mk
+ src/adts/module.mk
+ src/cmpi/module.mk
+ src/cmpi-cp/module.mk
+ src/cmpi-db/module.mk
+ src/mpi_tools/module.mk
+ src/mpirpc/module.mk
+ src/dense-1/module.mk
+ src/kda-2/module.mk
+ )
if test "x$ENABLE_TESTS" = "xyes" ; then
AC_CONFIG_FILES(
- test/adts/module.mk
- test/cmpi/module.mk
- test/cmpi-io/module.mk
- test/driver/module.mk
- test/gossip/module.mk
- test/mpirpc/module.mk
- test/mpi_tools/module.mk
- )
+ test/adts/module.mk
+ test/cmpi/module.mk
+ test/driver/module.mk
+ test/gossip/module.mk
+ test/mpirpc/module.mk
+ test/mpi_tools/module.mk
+ )
+ if test "x$USE_CMPI_IO" = "x1" ; then
+ AC_CONFIG_FILES(
+ test/cmpi-io/module.mk
+ )
+ fi
fi
AC_OUTPUT
Modified: test/adts/module.mk.in
===================================================================
--- test/adts/module.mk.in 2010-05-04 18:46:20 UTC (rev 66)
+++ test/adts/module.mk.in 2010-05-05 15:56:25 UTC (rev 67)
@@ -4,3 +4,7 @@
test/adts/test%.x: test/adts/test%.o src/mpi_tools/mpi_tools.o $(CMPI)
$(Q) " LINK $(@) "
$(E)$(MPICC) $(MPE) $(<) src/mpi_tools/mpi_tools.o $(ADT_OBJS) $(LIBS) -o $(@)
+
+test/adts/test%.out: test/adts/test%.x
+ $(Q) " TEST $(@) "
+ $(E)$(<) > $(@) 2>&1
Modified: test/driver/module.mk.in
===================================================================
--- test/driver/module.mk.in 2010-05-04 18:46:20 UTC (rev 66)
+++ test/driver/module.mk.in 2010-05-05 15:56:25 UTC (rev 67)
@@ -11,6 +11,10 @@
$(Q) " MPICC $(@) "
$(E)$(MPICC) $(MPE) $(<) test/driver/test_helpers.o $(CMPI) $(LIBS) -o $(@)
+test/driver/test%.out: test/driver/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/gossip/module.mk.in
===================================================================
--- test/gossip/module.mk.in 2010-05-04 18:46:20 UTC (rev 66)
+++ test/gossip/module.mk.in 2010-05-05 15:56:25 UTC (rev 67)
@@ -8,4 +8,5 @@
$(E)$(MPICC) $(<) $(CMPI) $(LIBS) -o $(@)
$(DIR)/test%.out: $(DIR)/test%.x
- $(patsubst %.x, %.zsh, $(<)) $(<)
+ $(Q) " TEST $(@) "
+ $(E)$(patsubst %.x, %.zsh, $(<)) $(<)
Modified: test/gossip/test-do.zsh
===================================================================
--- test/gossip/test-do.zsh 2010-05-04 18:46:20 UTC (rev 66)
+++ test/gossip/test-do.zsh 2010-05-05 15:56:25 UTC (rev 67)
@@ -1,6 +1,6 @@
#!/bin/zsh
-set -x
+# set -x
# Be sure to make tests with D=1
Modified: test/gossip/test-env.zsh
===================================================================
--- test/gossip/test-env.zsh 2010-05-04 18:46:20 UTC (rev 66)
+++ test/gossip/test-env.zsh 2010-05-05 15:56:25 UTC (rev 67)
@@ -1,6 +1,6 @@
#!/bin/zsh
-set -x
+# set -x
# Be sure to make tests with D=1
@@ -31,7 +31,7 @@
(( N == 3 )) || crash "N != 3"
# Should be 2 "Example debugging message."s
-N=$( grep -c "Example debugging message." ${OUT} )
+N=$( grep -c "EXAMPLE MESSAGE" ${OUT} )
(( N == 2 )) || crash "N != 2"
exit 0
Modified: test/gossip/test-masks.zsh
===================================================================
--- test/gossip/test-masks.zsh 2010-05-04 18:46:20 UTC (rev 66)
+++ test/gossip/test-masks.zsh 2010-05-05 15:56:25 UTC (rev 67)
@@ -1,6 +1,6 @@
#!/bin/zsh
-set -x
+# set -x
# Be sure to make tests with D=1
Modified: test/mpi_tools/module.mk.in
===================================================================
--- test/mpi_tools/module.mk.in 2010-05-04 18:46:20 UTC (rev 66)
+++ test/mpi_tools/module.mk.in 2010-05-05 15:56:25 UTC (rev 67)
@@ -3,10 +3,9 @@
TEST_SRC += $(TEST_MPITOOLS_SRC)
test/mpi_tools/test%.out: test/mpi_tools/test%.x
- $(LAUNCH) -n $(NODES) $(<) > $(@) 2>&1
+ $(Q) " TEST $(@) "
+ $(E)$(LAUNCH) -n 3 $(<) > $(@) 2>&1
test/mpi_tools/test%.x: test/mpi_tools/test%.o $(CMPI)
$(Q) " MPICC $(@) "
$(E)$(MPICC) $(MPE) $(<) $(CMPI) $(LIBS) -o $(@)
-
-
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
