Merge pull request #336 from ludwig-cf/fix-issue-330

Makefile should return a failure on failure
ludwig-cf · Dec 6, 2024 · 55e619a · 55e619a
2 parents 360ac42 + 36cc95d
commit 55e619a
Show file tree

Hide file tree

Showing 5 changed files with 58 additions and 35 deletions.
diff --git a/tests/regression/d2q9/Makefile b/tests/regression/d2q9/Makefile
@@ -2,17 +2,23 @@
 #
 #  Makefile
 #
-#  D2Q9 regression tests
-#
 ###############################################################################
 
 include ../../../Makefile.mk
 
 PAR=${LAUNCH_MPIRUN_CMD}
 
-d2q9:
-	@echo "TEST --> regression tests (d2q9)"
-	inputs='serial*inp'; \
-	for file in $$inputs; do ../../test.sh $$file "" "$(PAR)"; done
+SOURCES = $(wildcard *.inp)
+LOGS    = ${SOURCES:.inp=.new}
+
+test:
+	$(MAKE) -s clean
+	$(MAKE) -s logs
+	@echo End of tests.
+
+logs:	$(LOGS)
+
+%.new:	%.inp
+	../../test.sh $< "" "${PAR}"
 clean:
-	rm -f *new test-diff* input
+	rm -f *new test-diff* *meta *001-001
diff --git a/tests/regression/d3q15/Makefile b/tests/regression/d3q15/Makefile
@@ -2,17 +2,23 @@
 #
 #  Makefile
 #
-#  D3Q15 regression tests
-#
 ###############################################################################
 
 include ../../../Makefile.mk
 
 PAR=${LAUNCH_MPIRUN_CMD}
 
-serial:
-	@echo "TEST --> regression tests (d3q15)"
-	inputs='serial*inp'; \
-	for file in $$inputs; do ../../test.sh $$file "" "$(PAR)"; done
+SOURCES = $(wildcard *.inp)
+LOGS    = ${SOURCES:.inp=.new}
+
+test:
+	$(MAKE) -s clean
+	$(MAKE) -s logs
+	@echo End of tests.
+
+logs:	$(LOGS)
+
+%.new:	%.inp
+	../../test.sh $< "" "${PAR}"
 clean:
-	rm -f *new test-diff* input
+	rm -f *new test-diff* *meta *001-001
diff --git a/tests/regression/d3q27/Makefile b/tests/regression/d3q27/Makefile
@@ -2,17 +2,23 @@
 #
 #  Makefile
 #
-#  D3Q27 regression tests
-#
 ###############################################################################
 
 include ../../../Makefile.mk
 
 PAR=${LAUNCH_MPIRUN_CMD}
 
-serial:
-	@echo "TEST --> regression tests (d3q27)"
-	inputs='serial*inp'; \
-	for file in $$inputs; do ../../test.sh $$file "" "$(PAR)"; done
+SOURCES = $(wildcard *.inp)
+LOGS    = ${SOURCES:.inp=.new}
+
+test:
+	$(MAKE) -s clean
+	$(MAKE) -s logs
+	@echo End of tests.
+
+logs:	$(LOGS)
+
+%.new:	%.inp
+	../../test.sh $< "" "${PAR}"
 clean:
-	rm -f *new test-diff* input
+	rm -f *new test-diff* *meta *001-001
diff --git a/tests/regression/d3q27/serial-elip-s03.log b/tests/regression/d3q27/serial-elip-s03.log
@@ -107,20 +107,22 @@ Starting time step loop.
 Particle statistics:
 
 Colloid velocities - x y z
-[minimum ]  6.4306406e-03 -1.7741963e-05 -1.7741963e-05
-[maximum ]  6.4306406e-03 -1.7741963e-05 -1.7741963e-05
+[minimum ]  6.4306388e-03 -1.7703160e-05 -1.7703160e-05
+[maximum ]  6.4306388e-03 -1.7703160e-05 -1.7703160e-05
 
 Scalars - total mean variance min max
-[rho]       32560.00  1.00000000000  1.9972572e-09  0.99826881739  1.00441854328
+[rho]      32560.00  1.00000000000  1.9972597e-09  0.99826876562  1.00441859091
+
 
 Momentum - x y z
 [total   ] -1.3433699e-13 -5.1482256e-15  3.8679997e-15
-[fluid   ] -1.2940888e+00  3.4147104e-03  3.4147104e-03
-[colloids]  1.2940888e+00 -3.4147104e-03 -3.4147104e-03
+[fluid   ] -1.2940885e+00  3.4081177e-03  3.4081177e-03
+[colloids]  1.2940885e+00 -3.4081177e-03 -3.4081177e-03
 
 Velocity - x y z
-[minimum ] -4.0246851e-03 -2.4449766e-03 -2.4449766e-03
-[maximum ]  1.8512408e-03  2.5745655e-03  2.5745655e-03
+[minimum ] -4.0247187e-03 -2.4450319e-03 -2.4450319e-03
+[maximum ]  1.8512417e-03  2.5745714e-03  2.5745714e-03
+
 
 Completed cycle 10
 

diff --git a/tests/regression/d3q27/serial-elip-s04.log b/tests/regression/d3q27/serial-elip-s04.log
@@ -108,20 +108,23 @@ Starting time step loop.
 Particle statistics:
 
 Colloid velocities - x y z
-[minimum ]  6.4005865e-03 -3.9979463e-05 -3.9979463e-05
-[maximum ]  6.4005865e-03 -3.9979463e-05 -3.9979463e-05
+[minimum ]  6.4005826e-03 -3.9908322e-05 -3.9908322e-05
+[maximum ]  6.4005826e-03 -3.9908322e-05 -3.9908322e-05
+
 
 Scalars - total mean variance min max
-[rho]       32560.00  1.00000000000  1.0865699e-08  0.99661770937  1.00083934723
+[rho]      32560.00  1.00000000000  1.0865577e-08  0.99661751238  1.00083939335
+
 
 Momentum - x y z
 [total   ] -1.4832580e-13 -2.0774181e-14 -8.6259125e-15
-[fluid   ] -1.2826249e+00  6.5402714e-03  6.5402714e-03
-[colloids]  1.2826249e+00 -6.5402714e-03 -6.5402714e-03
+[fluid   ] -1.2826242e+00  6.5269074e-03  6.5269074e-03
+[colloids]  1.2826242e+00 -6.5269074e-03 -6.5269074e-03
 
 Velocity - x y z
-[minimum ] -4.9274366e-03 -2.7857056e-03 -2.7857056e-03
-[maximum ]  1.7194405e-03  2.9575687e-03  2.9575687e-03
+[minimum ] -4.9274808e-03 -2.7857644e-03 -2.7857644e-03
+[maximum ]  1.7194614e-03  2.9575581e-03  2.9575581e-03
+
 
 Completed cycle 10