Added "test" targets to all Makefiles.
authorOrion Lawlor <olawlor@acm.org>
Wed, 13 Oct 2004 03:28:06 +0000 (03:28 +0000)
committerOrion Lawlor <olawlor@acm.org>
Wed, 13 Oct 2004 03:28:06 +0000 (03:28 +0000)
26 files changed:
examples/Makefile [new file with mode: 0644]
examples/ampi/Makefile [new file with mode: 0755]
examples/charm++/Makefile [new file with mode: 0644]
examples/charm++/RedExample/Makefile
examples/charm++/hello/Makefile
examples/charm++/integrate2/Makefile
examples/charm++/integrateArray/Makefile
examples/charm++/piArray/Makefile
examples/charm++/ring/Makefile
examples/charm++/rings/Makefile
examples/charm++/speeds/Makefile
examples/converse/Makefile [new file with mode: 0644]
examples/converse/pingpong/pingpong.C
examples/fem/Makefile [new file with mode: 0644]
examples/fem/crack2D/Makefile
examples/fem/matrix/Makefile
examples/fem/matrix/pgm.C
tests/Makefile [new file with mode: 0644]
tests/ampi/Makefile
tests/charm++/Makefile [new file with mode: 0644]
tests/charm++/chkpt/Makefile
tests/charm++/commtest/Makefile [new file with mode: 0644]
tests/charm++/commtest/pipeBroadcast/Makefile
tests/converse/Makefile [new file with mode: 0644]
tests/fem/Makefile [new file with mode: 0644]
tests/fem/femtest/Makefile

diff --git a/examples/Makefile b/examples/Makefile
new file mode 100644 (file)
index 0000000..18abd2d
--- /dev/null
@@ -0,0 +1,11 @@
+DIRS=charm++ converse ampi fem
+
+test:
+       for d in $(DIRS); do \
+               (cd $$d; make test OPTS='$(OPTS)' || exit 1) || exit 1; \
+       done
+
+clean:
+       for d in $(DIRS); do (cd $$d; make clean OPTS='$(OPTS)'); done
+       rm -f TAGS #*#
+       rm -f core *~
diff --git a/examples/ampi/Makefile b/examples/ampi/Makefile
new file mode 100755 (executable)
index 0000000..069b04c
--- /dev/null
@@ -0,0 +1,11 @@
+DIRS=creduce Cjacobi3D
+
+test:
+       for d in $(DIRS); do \
+               (cd $$d; make test OPTS='$(OPTS)' || exit 1) || exit 1; \
+       done
+
+clean:
+       for d in $(DIRS); do (cd $$d; make clean OPTS='$(OPTS)'); done
+       rm -f TAGS #*#
+       rm -f core *~
diff --git a/examples/charm++/Makefile b/examples/charm++/Makefile
new file mode 100644 (file)
index 0000000..243ccc9
--- /dev/null
@@ -0,0 +1,13 @@
+DIRS=hello integrate integrate2 integrateArray \
+       piArray queens RedExample \
+       ring rings speeds
+
+test:
+       for d in $(DIRS); do \
+               (cd $$d; make test OPTS='$(OPTS)' || exit 1) || exit 1; \
+       done
+
+clean:
+       for d in $(DIRS); do (cd $$d; make clean OPTS='$(OPTS)'); done
+       rm -f TAGS #*#
+       rm -f core *~
index a38c987fdfc955017804460ed3888b204440e1d0..b1c7cb71da853fef6ec29d493b976de843c518bd 100644 (file)
@@ -19,4 +19,4 @@ RedExample.o: RedExample.C RedExample.decl.h RedExample.h
        $(CHARMC) -c RedExample.C
 
 test: all
-       ./charmrun ./RedExample 20 4.5 10.3 +p10
+       ./charmrun ./RedExample 20 4.5 10.3 +p4
index 24feb929638031ce8d1bec03f477838a5290b97b..65a045702726ad43906e9b4579fb9edfff8b528b 100644 (file)
@@ -1,13 +1,14 @@
-CHARMC=../../../bin/charmc $(OPTS)
+DIRS=1darray 3darray fancyarray \
+       darray dgroup \
+       group \
+       stl_array sdag
 
-pgm:  hello.o
-       $(CHARMC) hello.o  -o pgm -language charm++
-
-hello.o : hello.C hello.h hello.decl.h hello.def.h
-       $(CHARMC) -c hello.C
-
-hello.decl.h  hello.def.h:  hello.ci
-       $(CHARMC) hello.ci
+test:
+       for d in $(DIRS); do \
+               (cd $$d; make test OPTS='$(OPTS)' || exit 1) || exit 1; \
+       done
 
 clean:
-       rm -f *.o conv-host *.def.h *.decl.h *~ pgm charmrun
+       for d in $(DIRS); do (cd $$d; make clean OPTS='$(OPTS)'); done
+       rm -f TAGS #*#
+       rm -f core *~
index 594037691e951fc6ad7aa1d65e19f8db5998717d..38f0d6b4ca45056277c39b8d3aed17650cb6bf0d 100644 (file)
@@ -1,4 +1,4 @@
-CHARMC=../../../../bin/charmc $(OPTS)
+CHARMC=../../../bin/charmc $(OPTS)
 
 pgm: pgm.o
        $(CHARMC) pgm.o  -o pgm -language charm++
index ae2287a2aa8b30567fad9986f1342c8b6afa76ba..d14cf07f7740c64a6343b7ceeff06fd3758aa45f 100644 (file)
@@ -1,5 +1,8 @@
 # modify the path of CHARMC
-CHARMC=../../../../bin/charmc $(OPTS)
+CHARMC=../../../bin/charmc $(OPTS)
+
+test: pgm
+       ./charmrun +p4 pgm 1000000 100
 
 pgm: pgm.o
        $(CHARMC) pgm.o  -o pgm -language charm++
index 216ab19a1b7c39e9f1a19349f0a556c026f4580e..74a6406a89465c8b07f9a4312cc89a7ad3499950 100644 (file)
@@ -1,4 +1,7 @@
-CHARMC=../../../../bin/charmc $(OPTS)
+CHARMC=../../../bin/charmc $(OPTS)
+
+test: pgm
+       ./charmrun +p4 pgm 100000 100
 
 pgm: pgm.o
        $(CHARMC) pgm.o  -o pgm -language charm++
index 4b0322de7e60a19d8b96b04a599f97d85216348f..2c6f6edec30f6659f8178dde80ff031861101f4f 100644 (file)
@@ -1,4 +1,4 @@
-CHARMC=../../../../bin/charmc $(OPTS)
+CHARMC=../../../bin/charmc $(OPTS)
 
 pgm:  ring.o
        $(CHARMC) ring.o  -o pgm -language charm++
@@ -6,5 +6,8 @@ pgm:  ring.o
 ring.o : ring.C ring.h ring.ci
        $(CHARMC) -c ring.ci ring.C
 
+test: pgm
+       ./charmrun +p4 pgm
+
 clean:
        rm -f conv-host pgm *.def.h *.decl.h *.o *~ charmrun
index 0e8f7de07d0a8af74e142ae637ba1024d6a747cd..2ec3a683fa4f600cb2e2124ce8fb24bacdd007df 100644 (file)
@@ -1,4 +1,4 @@
-CHARMC=../../../../bin/charmc $(OPTS)
+CHARMC=../../../bin/charmc $(OPTS)
 
 pgm:  rings.o
        $(CHARMC) rings.o  -o pgm -language charm++
@@ -6,5 +6,8 @@ pgm:  rings.o
 rings.o : rings.C rings.h rings.ci
        $(CHARMC) -c rings.ci rings.C
 
+test: pgm
+       ./charmrun +p4 pgm
+
 clean:
        rm -f conv-host pgm *.o *.decl.h *.def.h *~ charmrun
index 59818589a1fbbe6760189fc36066ab6a7a43c1ab..3d0e1da45e03fadfa27ca10d5a50cdbfc32d9732 100644 (file)
@@ -1,4 +1,4 @@
-CHARMC=../../../../bin/charmc $(OPTS)
+CHARMC=../../../bin/charmc $(OPTS)
 
 pgm:  speed.o
        $(CHARMC) speed.o  -o pgm -language charm++
@@ -6,5 +6,8 @@ pgm:  speed.o
 speed.o : speed.C speed.h speed.ci
        $(CHARMC) -c speed.ci speed.C
 
+test: pgm
+       ./charmrun +p4 pgm 8
+
 clean:
        rm -f conv-host pgm *.def.h *.decl.h *.o *~ charmrun
diff --git a/examples/converse/Makefile b/examples/converse/Makefile
new file mode 100644 (file)
index 0000000..e0ce91d
--- /dev/null
@@ -0,0 +1,11 @@
+DIRS=pingpong
+
+test:
+       for d in $(DIRS); do \
+               (cd $$d; make test OPTS='$(OPTS)' || exit 1) || exit 1; \
+       done
+
+clean:
+       for d in $(DIRS); do (cd $$d; make clean OPTS='$(OPTS)'); done
+       rm -f TAGS #*#
+       rm -f core *~
index a4c95a3ed4e67bee63f821b5d9b15a450ab1042d..b00b18cb93b298ecea9f7089fa458edbe632e214 100644 (file)
@@ -2,7 +2,7 @@
 #include <converse.h>
 
 enum {nCycles = 1 << 8 };
-enum { maxMsgSize = 1 << 13 };
+enum { maxMsgSize = 1 << 18 }; 
 
 CpvDeclare(int,msgSize);
 CpvDeclare(int,cycleNum);
@@ -18,7 +18,7 @@ CpvStaticDeclare(double,endCTime);
 void startRing()
 {
   CpvAccess(cycleNum) = 0;
-  CpvAccess(msgSize) = 100 * CpvAccess(sizeNum) + CmiMsgHeaderSizeBytes;
+  CpvAccess(msgSize) = (1 << CpvAccess(sizeNum)) + CmiMsgHeaderSizeBytes;
   //CmiPrintf("PE %d startRing allocating %d bytes, header=%d bytes\n",
            //CmiMyPe(),CpvAccess(msgSize),CmiMsgHeaderSizeBytes);
   CmiPrintf(
diff --git a/examples/fem/Makefile b/examples/fem/Makefile
new file mode 100644 (file)
index 0000000..569c14d
--- /dev/null
@@ -0,0 +1,11 @@
+DIRS=simple2D crack2D matrix
+
+test:
+       for d in $(DIRS); do \
+               (cd $$d; make test OPTS='$(OPTS)' || exit 1) || exit 1; \
+       done
+
+clean:
+       for d in $(DIRS); do (cd $$d; make clean OPTS='$(OPTS)'); done
+       rm -f TAGS #*#
+       rm -f core *~
index bb66fe9ddf6bb30ceb65b2c56e102026c942158f..b4dafb4f5ea974ccaaa19b5fef27c3a3bf746a73 100644 (file)
@@ -1,4 +1,4 @@
-CHARMC=../../../../bin/charmc $(OPTS)
+CHARMC=../../../bin/charmc $(OPTS)
 COMMON_OBJS=   config.o mesh.o node.o \
        lst_NL.o lst_coh2.o
 FEM_OBJS=fem_main.o fem_mesh.o $(COMMON_OBJS)
index 3e55fc3cfe30abd0f14fb79a05bc5df7f434f493..6cf3980899fbfc5f2e1057c29f877b06185c5997 100644 (file)
@@ -1,4 +1,4 @@
-CHARMC=../../../../bin/charmc $(OPTS) 
+CHARMC=../../../bin/charmc $(OPTS) 
 
 all: pgm 
 
index 74bd0850f7e941c3c1c1e74f33ebf736642dadf7..a4c72fcde7ee53a21891a0f2ab41843c3865ed4c 100644 (file)
@@ -300,7 +300,7 @@ void myMesh::solve(ILSI_Solver s) {
   if (myId==0) {
     CkPrintf("Solved-- %d iterations, %g residual\n",
        (int)param.iterations,param.residual);
-    if (nnodes<50)
+    if (nnodes<10)
       for (int n=0;n<nnodes;n++) {
         int c;
         printf("  node %d  disp= ",n);
diff --git a/tests/Makefile b/tests/Makefile
new file mode 100644 (file)
index 0000000..18abd2d
--- /dev/null
@@ -0,0 +1,11 @@
+DIRS=charm++ converse ampi fem
+
+test:
+       for d in $(DIRS); do \
+               (cd $$d; make test OPTS='$(OPTS)' || exit 1) || exit 1; \
+       done
+
+clean:
+       for d in $(DIRS); do (cd $$d; make clean OPTS='$(OPTS)'); done
+       rm -f TAGS #*#
+       rm -f core *~
index 10bca455f024514fbfcbaf3543e9aabfc292f1ee..b30609a2746a1f39abe3fedf3cde69527717d5e4 100644 (file)
@@ -1,4 +1,4 @@
-DIRS=megampi creduce stacksize Cjacobi3D chkpt 
+DIRS=megampi stacksize chkpt 
 
 test:
        for d in $(DIRS); do \
diff --git a/tests/charm++/Makefile b/tests/charm++/Makefile
new file mode 100644 (file)
index 0000000..5518996
--- /dev/null
@@ -0,0 +1,11 @@
+DIRS=megatest pingpong simplearrayhello lb_test chkpt commtest
+
+test:
+       for d in $(DIRS); do \
+               (cd $$d; make test OPTS='$(OPTS)' || exit 1) || exit 1; \
+       done
+
+clean:
+       for d in $(DIRS); do (cd $$d; make clean OPTS='$(OPTS)'); done
+       rm -f TAGS #*#
+       rm -f core *~
index c6cc81c5b02633b9ca544c960262257bc6bf76a2..19ab1e51c40008fc864f6c53fe754cda08ae8203 100644 (file)
@@ -12,10 +12,7 @@ hello.decl.h: hello.ci
        $(CHARMC)  hello.ci
 
 clean:
-       rm -f *~ *.decl.h *.def.h conv-host *.o hello charmrun
-
-clear: clean
-       rm -rf log/
+       rm -f *~ *.decl.h *.def.h conv-host *.o hello charmrun log/
 
 hello.o: hello.C hello.decl.h
        $(CHARMC) -c hello.C
diff --git a/tests/charm++/commtest/Makefile b/tests/charm++/commtest/Makefile
new file mode 100644 (file)
index 0000000..b1a0915
--- /dev/null
@@ -0,0 +1,11 @@
+DIRS=comlib commlib_stream pipeBroadcast
+
+test:
+       for d in $(DIRS); do \
+               (cd $$d; make test OPTS='$(OPTS)' || exit 1) || exit 1; \
+       done
+
+clean:
+       for d in $(DIRS); do (cd $$d; make clean OPTS='$(OPTS)'); done
+       rm -f TAGS #*#
+       rm -f core *~
index 1a803e679920aec21d49d0365bcccdf4b4969567..de10ab2f231438d64c93ac5b710295f7a2955dcc 100644 (file)
@@ -4,9 +4,12 @@ MODULES = -module commlib
 
 OBJS = test.o benchmark.o
 
-all: test benchmark
+all: pgm benchmark
 
-test: test.o
+test: pgm
+       ./charmrun ./pgm +p4 10
+
+pgm: test.o
        $(CHARMC) -language charm++ -o $@ test.o $(MODULES) 
 
 test.decl.h: test.ci
@@ -25,6 +28,6 @@ benchmark.o: benchmark.C benchmark.decl.h benchmark.h
        $(CHARMC) -c benchmark.C
 
 clean:
-       rm -f *.decl.h *.def.h *.o test benchmark charmrun *~
+       rm -f *.decl.h *.def.h *.o pgm benchmark charmrun *~
 
 new: clean all
diff --git a/tests/converse/Makefile b/tests/converse/Makefile
new file mode 100644 (file)
index 0000000..ddd5dcb
--- /dev/null
@@ -0,0 +1,11 @@
+DIRS=commbench cthtest
+
+test:
+       for d in $(DIRS); do \
+               (cd $$d; make test OPTS='$(OPTS)' || exit 1) || exit 1; \
+       done
+
+clean:
+       for d in $(DIRS); do (cd $$d; make clean OPTS='$(OPTS)'); done
+       rm -f TAGS #*#
+       rm -f core *~
diff --git a/tests/fem/Makefile b/tests/fem/Makefile
new file mode 100644 (file)
index 0000000..045cdb0
--- /dev/null
@@ -0,0 +1,11 @@
+DIRS=femtest 
+
+test:
+       for d in $(DIRS); do \
+               (cd $$d; make test OPTS='$(OPTS)' || exit 1) || exit 1; \
+       done
+
+clean:
+       for d in $(DIRS); do (cd $$d; make clean OPTS='$(OPTS)'); done
+       rm -f TAGS #*#
+       rm -f core *~
index 9f350ca1b23a2919172c00ba108e21224023b268..812028d4e6e7a57923be389893f22331f10cca06 100644 (file)
@@ -1,4 +1,4 @@
-CHARMC=../../../../bin/charmc $(OPTS) 
+CHARMC=../../../bin/charmc $(OPTS) 
 
 all: pgm fpgm