Skip to content

Commit 56e8f79

Browse files
hiromatsuihiromatsui
committed
Replace test packages to stop if error happened
1 parent 8548336 commit 56e8f79

File tree

217 files changed

+145296
-2929
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

217 files changed

+145296
-2929
lines changed

‎tests/Communication_check/Makefile‎

Lines changed: 61 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -8,65 +8,79 @@ SHELL = /bin/sh
88
#
99
SRCDIR = /Users/matsui/src_kemo
1010
#
11-
MHDDIR = $(SRCDIR)/MHD
12-
BUILDDIR= $(SRCDIR)/bin
13-
TESTDIR= $(SRCDIR)/tests
14-
#
15-
# MPI settings
16-
#
17-
MPICHDIR =
18-
MPICHLIBDIR = $(MPICHDIR)/lib
19-
MPICHBINDIR = $(MPICHDIR)/bin
20-
MPICHINCDIR =
21-
MPILIBS =
11+
NP = 6
12+
MPIRUN= mpirun
13+
MPI_GEN = $(MPIRUN) -np $(NP) $(SRCDIR)/bin/utilities/gen_sph_grids
14+
MPI_CHECK = $(MPIRUN) -np $(NP) $(SRCDIR)/bin/tests/check_sph_grids
15+
MPI_TEST = $(MPIRUN) -np $(NP) $(SRCDIR)/bin/tests/check_sph_comms
2216
#
2317
#
2418
# -------------------------------------------------------------------------
2519
#
26-
SUBDIRS = \
27-
no_file \
28-
\
29-
ascii \
30-
binary \
31-
gzip \
32-
binary_gz \
33-
\
34-
merged \
35-
merged_bin \
36-
merged_gz \
37-
merged_bin_gz
38-
39-
#
40-
# -------------------------------------------------------------------------
41-
#
42-
4320

4421
all: test
4522

4623
test:
47-
@for dir in $(SUBDIRS) ; do \
48-
echo "# Test spherical harmonics indexining in $${dir} directory..."; \
49-
( cd $${dir}; \
50-
$(GMAKE) \
51-
GMAKE="$(GMAKE)" \
52-
BUILDDIR="$(BUILDDIR)" \
53-
TESTDIR="$(TESTDIR)" \
54-
MHDDIR="$(MHDDIR)" \
55-
MPIRUN="$(MPIRUN)" \
56-
test)\
57-
done; \
58-
echo "# Test Communication without indexing file"; \
59-
$(MPIRUN) -np 6 $(BUILDDIR)/tests/check_sph_comms > log.txt
24+
@echo "# Test spherical harmonics indexining in ascii directory..."
25+
@cd ascii; \
26+
$(GMAKE) MPI_GEN="$(MPI_GEN)" MPI_CHECK="$(MPI_CHECK)" MPI_TEST="$(MPI_TEST)" \
27+
test
28+
29+
@echo "# Test spherical harmonics indexining in binary directory..."
30+
@cd binary; \
31+
$(GMAKE) MPI_GEN="$(MPI_GEN)" MPI_CHECK="$(MPI_CHECK)" MPI_TEST="$(MPI_TEST)" \
32+
test
33+
34+
@echo "# Test spherical harmonics indexining in gzip directory..."
35+
@cd gzip; \
36+
$(GMAKE) MPI_GEN="$(MPI_GEN)" MPI_CHECK="$(MPI_CHECK)" MPI_TEST="$(MPI_TEST)" \
37+
test
38+
39+
@echo "# Test spherical harmonics indexining in binary_gz directory..."
40+
@cd binary_gz; \
41+
$(GMAKE) MPI_GEN="$(MPI_GEN)" MPI_CHECK="$(MPI_CHECK)" MPI_TEST="$(MPI_TEST)" \
42+
test
43+
44+
@echo "# Test spherical harmonics indexining in merged directory..."
45+
@cd merged; \
46+
$(GMAKE) MPI_GEN="$(MPI_GEN)" MPI_CHECK="$(MPI_CHECK)" MPI_TEST="$(MPI_TEST)" \
47+
test
48+
49+
@echo "# Test spherical harmonics indexining in merged_bin directory..."
50+
@cd merged_bin; \
51+
$(GMAKE) MPI_GEN="$(MPI_GEN)" MPI_CHECK="$(MPI_CHECK)" MPI_TEST="$(MPI_TEST)" \
52+
test
53+
54+
@echo "# Test spherical harmonics indexining in merged_gz directory..."
55+
@cd merged_gz; \
56+
$(GMAKE) MPI_GEN="$(MPI_GEN)" MPI_CHECK="$(MPI_CHECK)" MPI_TEST="$(MPI_TEST)" \
57+
test
58+
59+
@echo "# Test spherical harmonics indexining in merged_bin_gz directory..."
60+
@cd merged_bin_gz; \
61+
$(GMAKE) MPI_GEN="$(MPI_GEN)" MPI_CHECK="$(MPI_CHECK)" MPI_TEST="$(MPI_TEST)" \
62+
test
63+
64+
@echo "# Test spherical harmonics indexining in no_file directory..."
65+
@cd no_file; \
66+
$(GMAKE) MPI_TEST="$(MPI_TEST)" \
67+
test
6068

6169
@rm -f *.dat *.txt
62-
@rm -f mpif.h *.o *.mod *~ *.par *.diag *.a *.f90
6370

6471
clean:
65-
for dir in $(SUBDIRS) ; do \
66-
echo "# cleaning $${dir} directory..."; \
67-
( cd $${dir}; \
68-
make clean )\
69-
done; \
72+
cd ascii; make clean
73+
cd binary; make clean
74+
cd gzip; make clean
75+
cd binary_gz; make clean
76+
77+
cd merged; make clean
78+
cd merged_bin; make clean
79+
cd merged_gz; make clean
80+
cd merged_bin_gz; make clean
81+
82+
cd no_file; make clean
83+
7084
rm -f reference/in.*
7185
rm -f mpif.h *.o *.mod *~ *.par *.diag *.a *.f90
7286

‎tests/Communication_check/ascii/Makefile‎

Lines changed: 20 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -8,26 +8,33 @@ SHELL = /bin/sh
88
#
99
SRCDIR = /Users/matsui/src_kemo
1010
#
11-
MHDDIR = $(SRCDIR)/MHD
12-
BUILDDIR= $(SRCDIR)/bin
13-
TESTDIR= $(SRCDIR)/tests
11+
NP = 6
12+
MPIRUN= mpirun
13+
MPI_GEN = $(MPIRUN) -np $(NP) $(SRCDIR)/bin/utilities/gen_sph_grids
14+
MPI_CHECK = $(MPIRUN) -np $(NP) $(SRCDIR)/bin/tests/check_sph_grids
15+
MPI_TEST = $(MPIRUN) -np $(NP) $(SRCDIR)/bin/tests/check_sph_comms
1416
#
15-
# MPI settings
1617
#
17-
MPICHDIR =
18-
MPICHLIBDIR = $(MPICHDIR)/lib
19-
MPICHBINDIR = $(MPICHDIR)/bin
20-
MPICHINCDIR =
21-
MPILIBS =
18+
# -------------------------------------------------------------------------
2219
#
2320

21+
2422
all: test
2523

2624
test:
27-
rm -f *.dat
28-
$(MPIRUN) -np 6 $(BUILDDIR)/utilities/gen_sph_grids > log.txt
29-
$(MPIRUN) -np 6 $(BUILDDIR)/tests/check_sph_grids >> log.txt
30-
$(MPIRUN) -np 6 $(BUILDDIR)/tests/check_sph_comms >> log.txt
25+
rm -f *.dat *.txt
26+
$(MPI_GEN) > log.txt
27+
$(MPI_CHECK) >> log.txt
28+
@if [ `tail -n 1 flag.txt` != 0 ]; then\
29+
echo 'Failed spherical shell grid check'; \
30+
exit 1;\
31+
fi
32+
$(MPI_TEST) >> log.txt
33+
@if [ `tail -n 1 flag.txt` != 0 ]; then\
34+
echo 'Failed spherical shell communication check'; \
35+
exit 1;\
36+
fi
37+
@echo 'ASCII indexing file is correct'
3138

3239
clean:
3340
rm -f *.dat *.txt mesh/in.*

‎tests/Communication_check/binary/Makefile‎

Lines changed: 20 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -8,26 +8,33 @@ SHELL = /bin/sh
88
#
99
SRCDIR = /Users/matsui/src_kemo
1010
#
11-
MHDDIR = $(SRCDIR)/MHD
12-
BUILDDIR= $(SRCDIR)/bin
13-
TESTDIR= $(SRCDIR)/tests
11+
NP = 6
12+
MPIRUN= mpirun
13+
MPI_GEN = $(MPIRUN) -np $(NP) $(SRCDIR)/bin/utilities/gen_sph_grids
14+
MPI_CHECK = $(MPIRUN) -np $(NP) $(SRCDIR)/bin/tests/check_sph_grids
15+
MPI_TEST = $(MPIRUN) -np $(NP) $(SRCDIR)/bin/tests/check_sph_comms
1416
#
15-
# MPI settings
1617
#
17-
MPICHDIR =
18-
MPICHLIBDIR = $(MPICHDIR)/lib
19-
MPICHBINDIR = $(MPICHDIR)/bin
20-
MPICHINCDIR =
21-
MPILIBS =
18+
# -------------------------------------------------------------------------
2219
#
2320

21+
2422
all: test
2523

2624
test:
27-
rm -f *.dat
28-
$(MPIRUN) -np 6 $(BUILDDIR)/utilities/gen_sph_grids > log.txt
29-
$(MPIRUN) -np 6 $(BUILDDIR)/tests/check_sph_grids >> log.txt
30-
$(MPIRUN) -np 6 $(BUILDDIR)/tests/check_sph_comms >> log.txt
25+
rm -f *.dat *.txt
26+
$(MPI_GEN) > log.txt
27+
$(MPI_CHECK) >> log.txt
28+
@if [ `tail -n 1 flag.txt` != 0 ]; then\
29+
echo 'Failed spherical shell grid check'; \
30+
exit 1;\
31+
fi
32+
$(MPI_TEST) >> log.txt
33+
@if [ `tail -n 1 flag.txt` != 0 ]; then\
34+
echo 'Failed spherical shell communication check'; \
35+
exit 1;\
36+
fi
37+
@echo 'BINARY indexing file is correct'
3138

3239
clean:
3340
rm -f *.dat *.txt mesh/in.*

‎tests/Communication_check/binary_gz/Makefile‎

Lines changed: 20 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -8,26 +8,33 @@ SHELL = /bin/sh
88
#
99
SRCDIR = /Users/matsui/src_kemo
1010
#
11-
MHDDIR = $(SRCDIR)/MHD
12-
BUILDDIR= $(SRCDIR)/bin
13-
TESTDIR= $(SRCDIR)/tests
11+
NP = 6
12+
MPIRUN= mpirun
13+
MPI_GEN = $(MPIRUN) -np $(NP) $(SRCDIR)/bin/utilities/gen_sph_grids
14+
MPI_CHECK = $(MPIRUN) -np $(NP) $(SRCDIR)/bin/tests/check_sph_grids
15+
MPI_TEST = $(MPIRUN) -np $(NP) $(SRCDIR)/bin/tests/check_sph_comms
1416
#
15-
# MPI settings
1617
#
17-
MPICHDIR =
18-
MPICHLIBDIR = $(MPICHDIR)/lib
19-
MPICHBINDIR = $(MPICHDIR)/bin
20-
MPICHINCDIR =
21-
MPILIBS =
18+
# -------------------------------------------------------------------------
2219
#
2320

21+
2422
all: test
2523

2624
test:
27-
rm -f *.dat
28-
$(MPIRUN) -np 6 $(BUILDDIR)/utilities/gen_sph_grids > log.txt
29-
$(MPIRUN) -np 6 $(BUILDDIR)/tests/check_sph_grids >> log.txt
30-
$(MPIRUN) -np 6 $(BUILDDIR)/tests/check_sph_comms >> log.txt
25+
rm -f *.dat *.txt
26+
$(MPI_GEN) > log.txt
27+
$(MPI_CHECK) >> log.txt
28+
@if [ `tail -n 1 flag.txt` != 0 ]; then\
29+
echo 'Failed spherical shell grid check'; \
30+
exit 1;\
31+
fi
32+
$(MPI_TEST) >> log.txt
33+
@if [ `tail -n 1 flag.txt` != 0 ]; then\
34+
echo 'Failed spherical shell communication check'; \
35+
exit 1;\
36+
fi
37+
@echo 'Gzipped BINARY indexing file is correct'
3138

3239
clean:
3340
rm -f *.dat *.txt mesh/in.*

‎tests/Communication_check/gzip/Makefile‎

Lines changed: 13 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -4,30 +4,23 @@
44
#
55
SHELL = /bin/sh
66
#
7-
# directories of Kemo's Dynamo toolkit
8-
#
9-
SRCDIR = /Users/matsui/src_kemo
10-
#
11-
MHDDIR = $(SRCDIR)/MHD
12-
BUILDDIR= $(SRCDIR)/bin
13-
TESTDIR= $(SRCDIR)/tests
14-
#
15-
# MPI settings
16-
#
17-
MPICHDIR =
18-
MPICHLIBDIR = $(MPICHDIR)/lib
19-
MPICHBINDIR = $(MPICHDIR)/bin
20-
MPICHINCDIR =
21-
MPILIBS =
22-
#
237

248
all: test
259

2610
test:
27-
rm -f *.dat
28-
$(MPIRUN) -np 6 $(BUILDDIR)/utilities/gen_sph_grids > log.txt
29-
$(MPIRUN) -np 6 $(BUILDDIR)/tests/check_sph_grids >> log.txt
30-
$(MPIRUN) -np 6 $(BUILDDIR)/tests/check_sph_comms >> log.txt
11+
rm -f *.dat *.txt
12+
$(MPI_GEN) > log.txt
13+
$(MPI_CHECK) >> log.txt
14+
@if [ `tail -n 1 flag.txt` != 0 ]; then\
15+
echo 'Failed spherical shell grid check'; \
16+
exit 1;\
17+
fi
18+
$(MPI_TEST) >> log.txt
19+
@if [ `tail -n 1 flag.txt` != 0 ]; then\
20+
echo 'Failed spherical shell communication check'; \
21+
exit 1;\
22+
fi
23+
@echo 'Gzipped ASCII indexing file is correct'
3124

3225
clean:
3326
rm -f *.dat *.txt mesh/in.*

‎tests/Communication_check/merged/Makefile‎

Lines changed: 20 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -8,26 +8,33 @@ SHELL = /bin/sh
88
#
99
SRCDIR = /Users/matsui/src_kemo
1010
#
11-
MHDDIR = $(SRCDIR)/MHD
12-
BUILDDIR= $(SRCDIR)/bin
13-
TESTDIR= $(SRCDIR)/tests
11+
NP = 6
12+
MPIRUN= mpirun
13+
MPI_GEN = $(MPIRUN) -np $(NP) $(SRCDIR)/bin/utilities/gen_sph_grids
14+
MPI_CHECK = $(MPIRUN) -np $(NP) $(SRCDIR)/bin/tests/check_sph_grids
15+
MPI_TEST = $(MPIRUN) -np $(NP) $(SRCDIR)/bin/tests/check_sph_comms
1416
#
15-
# MPI settings
1617
#
17-
MPICHDIR =
18-
MPICHLIBDIR = $(MPICHDIR)/lib
19-
MPICHBINDIR = $(MPICHDIR)/bin
20-
MPICHINCDIR =
21-
MPILIBS =
18+
# -------------------------------------------------------------------------
2219
#
2320

21+
2422
all: test
2523

2624
test:
27-
rm -f *.dat
28-
$(MPIRUN) -np 6 $(BUILDDIR)/utilities/gen_sph_grids > log.txt
29-
$(MPIRUN) -np 6 $(BUILDDIR)/tests/check_sph_grids >> log.txt
30-
$(MPIRUN) -np 6 $(BUILDDIR)/tests/check_sph_comms >> log.txt
25+
rm -f *.dat *.txt
26+
$(MPI_GEN) > log.txt
27+
$(MPI_CHECK) >> log.txt
28+
@if [ `tail -n 1 flag.txt` != 0 ]; then\
29+
echo 'Failed spherical shell grid check'; \
30+
exit 1;\
31+
fi
32+
$(MPI_TEST) >> log.txt
33+
@if [ `tail -n 1 flag.txt` != 0 ]; then\
34+
echo 'Failed spherical shell communication check'; \
35+
exit 1;\
36+
fi
37+
@echo 'Merged ASCII indexing file is correct'
3138

3239
clean:
3340
rm -f *.dat *.txt in.*

0 commit comments

Comments
 (0)