Fixed regtest Makefiles

Instead of using symlinks, now the standard Makefile in included. This is more robust (previously, many Makefiles were just plain copies instead of symlinks).
chen-jialan · Dec 5, 2012 · d3133bd · d3133bd
1 parent 1f6fa1d
commit d3133bd
Show file tree

Hide file tree

Showing 52 changed files with 53 additions and 185 deletions.
diff --git a/regtest/README b/regtest/README
@@ -12,8 +12,8 @@ HOW TO ADD A NEW TEST
 Add a new directory rtXXX, let's say rt105, and go there:
 > cd rt105
 
-Link the common makefile
-> ln -s ../scripts/test.make ./Makefile
+Put a standard makefile there:
+> echo "include ../scripts/test.make" > rt105/Makefile
 
 Put in the rt105 directory a "config" files containing the
 options which define your test.

diff --git a/regtest/rt-mpi0/Makefile b/regtest/rt-mpi0/Makefile
diff --git a/regtest/rt-mpi0/Makefile b/regtest/rt-mpi0/Makefile
@@ -0,0 +1 @@
+include ../scripts/test.make
diff --git a/regtest/rt-mpi1/Makefile b/regtest/rt-mpi1/Makefile
@@ -1,13 +1 @@
-
-test:
-	../scripts/run
-
-reset:
-	../scripts/reset
-
-clean:
-	rm -fr tmp/ report.txt
-
-valgrind:
-	../scripts/run --valgrind
-
+include ../scripts/test.make
diff --git a/regtest/rt-mpi2/Makefile b/regtest/rt-mpi2/Makefile
diff --git a/regtest/rt-mpi2/Makefile b/regtest/rt-mpi2/Makefile
@@ -0,0 +1 @@
+include ../scripts/test.make
diff --git a/regtest/rt-mpi3/Makefile b/regtest/rt-mpi3/Makefile
@@ -1,13 +1 @@
-
-test:
-	../scripts/run
-
-reset:
-	../scripts/reset
-
-clean:
-	rm -fr tmp/ report.txt
-
-valgrind:
-	../scripts/run --valgrind
-
+include ../scripts/test.make
diff --git a/regtest/rt-simplemd0/Makefile b/regtest/rt-simplemd0/Makefile
diff --git a/regtest/rt-simplemd0/Makefile b/regtest/rt-simplemd0/Makefile
@@ -0,0 +1 @@
+include ../scripts/test.make
diff --git a/regtest/rt-simplemd1/Makefile b/regtest/rt-simplemd1/Makefile
diff --git a/regtest/rt-simplemd1/Makefile b/regtest/rt-simplemd1/Makefile
@@ -0,0 +1 @@
+include ../scripts/test.make
diff --git a/regtest/rt-simplemd2/Makefile b/regtest/rt-simplemd2/Makefile
diff --git a/regtest/rt-simplemd2/Makefile b/regtest/rt-simplemd2/Makefile
@@ -0,0 +1 @@
+include ../scripts/test.make
diff --git a/regtest/rt-tg1/Makefile b/regtest/rt-tg1/Makefile
diff --git a/regtest/rt-tg1/Makefile b/regtest/rt-tg1/Makefile
@@ -0,0 +1 @@
+include ../scripts/test.make
diff --git a/regtest/rt0/Makefile b/regtest/rt0/Makefile
diff --git a/regtest/rt0/Makefile b/regtest/rt0/Makefile
@@ -0,0 +1 @@
+include ../scripts/test.make
diff --git a/regtest/rt1/Makefile b/regtest/rt1/Makefile
diff --git a/regtest/rt1/Makefile b/regtest/rt1/Makefile
@@ -0,0 +1 @@
+include ../scripts/test.make
diff --git a/regtest/rt10-mpi/Makefile b/regtest/rt10-mpi/Makefile
@@ -1,13 +1 @@
-
-test:
-	../scripts/run
-
-reset:
-	../scripts/reset
-
-clean:
-	rm -fr tmp/ report.txt
-
-valgrind:
-	../scripts/run --valgrind
-
+include ../scripts/test.make
diff --git a/regtest/rt10-restart/Makefile b/regtest/rt10-restart/Makefile
diff --git a/regtest/rt10-restart/Makefile b/regtest/rt10-restart/Makefile
@@ -0,0 +1 @@
+include ../scripts/test.make
diff --git a/regtest/rt10/Makefile b/regtest/rt10/Makefile
diff --git a/regtest/rt10/Makefile b/regtest/rt10/Makefile
@@ -0,0 +1 @@
+include ../scripts/test.make
diff --git a/regtest/rt11-mpi/Makefile b/regtest/rt11-mpi/Makefile
@@ -1,13 +1 @@
-
-test:
-	../scripts/run
-
-reset:
-	../scripts/reset
-
-clean:
-	rm -fr tmp/ report.txt
-
-valgrind:
-	../scripts/run --valgrind
-
+include ../scripts/test.make
diff --git a/regtest/rt11/Makefile b/regtest/rt11/Makefile
diff --git a/regtest/rt11/Makefile b/regtest/rt11/Makefile
@@ -0,0 +1 @@
+include ../scripts/test.make
diff --git a/regtest/rt12/Makefile b/regtest/rt12/Makefile
diff --git a/regtest/rt12/Makefile b/regtest/rt12/Makefile
@@ -0,0 +1 @@
+include ../scripts/test.make
diff --git a/regtest/rt14/Makefile b/regtest/rt14/Makefile
diff --git a/regtest/rt14/Makefile b/regtest/rt14/Makefile
@@ -0,0 +1 @@
+include ../scripts/test.make
diff --git a/regtest/rt15/Makefile b/regtest/rt15/Makefile
diff --git a/regtest/rt15/Makefile b/regtest/rt15/Makefile
@@ -0,0 +1 @@
+include ../scripts/test.make
diff --git a/regtest/rt16/Makefile b/regtest/rt16/Makefile
diff --git a/regtest/rt16/Makefile b/regtest/rt16/Makefile
@@ -0,0 +1 @@
+include ../scripts/test.make
diff --git a/regtest/rt17/Makefile b/regtest/rt17/Makefile
diff --git a/regtest/rt17/Makefile b/regtest/rt17/Makefile
@@ -0,0 +1 @@
+include ../scripts/test.make
diff --git a/regtest/rt18/Makefile b/regtest/rt18/Makefile
diff --git a/regtest/rt18/Makefile b/regtest/rt18/Makefile
@@ -0,0 +1 @@
+include ../scripts/test.make
diff --git a/regtest/rt19-mpi/Makefile b/regtest/rt19-mpi/Makefile
diff --git a/regtest/rt19-mpi/Makefile b/regtest/rt19-mpi/Makefile
@@ -0,0 +1 @@
+include ../scripts/test.make
diff --git a/regtest/rt19/Makefile b/regtest/rt19/Makefile
diff --git a/regtest/rt19/Makefile b/regtest/rt19/Makefile
@@ -0,0 +1 @@
+include ../scripts/test.make
diff --git a/regtest/rt2/Makefile b/regtest/rt2/Makefile
diff --git a/regtest/rt2/Makefile b/regtest/rt2/Makefile
@@ -0,0 +1 @@
+include ../scripts/test.make
diff --git a/regtest/rt20-mpi/Makefile b/regtest/rt20-mpi/Makefile
diff --git a/regtest/rt20-mpi/Makefile b/regtest/rt20-mpi/Makefile
@@ -0,0 +1 @@
+include ../scripts/test.make
diff --git a/regtest/rt20/Makefile b/regtest/rt20/Makefile
diff --git a/regtest/rt20/Makefile b/regtest/rt20/Makefile
@@ -0,0 +1 @@
+include ../scripts/test.make
diff --git a/regtest/rt21/Makefile b/regtest/rt21/Makefile
diff --git a/regtest/rt21/Makefile b/regtest/rt21/Makefile
@@ -0,0 +1 @@
+include ../scripts/test.make
diff --git a/regtest/rt22/Makefile b/regtest/rt22/Makefile
diff --git a/regtest/rt22/Makefile b/regtest/rt22/Makefile
@@ -0,0 +1 @@
+include ../scripts/test.make
diff --git a/regtest/rt24/Makefile b/regtest/rt24/Makefile
diff --git a/regtest/rt24/Makefile b/regtest/rt24/Makefile
@@ -0,0 +1 @@
+include ../scripts/test.make
diff --git a/regtest/rt26/Makefile b/regtest/rt26/Makefile
diff --git a/regtest/rt26/Makefile b/regtest/rt26/Makefile
@@ -0,0 +1 @@
+include ../scripts/test.make
diff --git a/regtest/rt27/Makefile b/regtest/rt27/Makefile
diff --git a/regtest/rt27/Makefile b/regtest/rt27/Makefile
@@ -0,0 +1 @@
+include ../scripts/test.make
diff --git a/regtest/rt3/Makefile b/regtest/rt3/Makefile
diff --git a/regtest/rt3/Makefile b/regtest/rt3/Makefile
@@ -0,0 +1 @@
+include ../scripts/test.make
diff --git a/regtest/rt30/Makefile b/regtest/rt30/Makefile
diff --git a/regtest/rt30/Makefile b/regtest/rt30/Makefile
@@ -0,0 +1 @@
+include ../scripts/test.make
diff --git a/regtest/rt31/Makefile b/regtest/rt31/Makefile
@@ -1,13 +1 @@
-
-test:
-	../scripts/run
-
-reset:
-	../scripts/reset
-
-clean:
-	rm -fr tmp/ report.txt
-
-valgrind:
-	../scripts/run --valgrind
-
+include ../scripts/test.make
diff --git a/regtest/rt32/Makefile b/regtest/rt32/Makefile
diff --git a/regtest/rt32/Makefile b/regtest/rt32/Makefile
@@ -0,0 +1 @@
+include ../scripts/test.make
diff --git a/regtest/rt33/Makefile b/regtest/rt33/Makefile
diff --git a/regtest/rt33/Makefile b/regtest/rt33/Makefile
@@ -0,0 +1 @@
+include ../scripts/test.make
diff --git a/regtest/rt34/Makefile b/regtest/rt34/Makefile
diff --git a/regtest/rt34/Makefile b/regtest/rt34/Makefile
@@ -0,0 +1 @@
+include ../scripts/test.make
diff --git a/regtest/rt35/Makefile b/regtest/rt35/Makefile
@@ -1,13 +1 @@
-
-test:
-	../scripts/run
-
-reset:
-	../scripts/reset
-
-clean:
-	rm -fr tmp/ report.txt
-
-valgrind:
-	../scripts/run --valgrind
-
+include ../scripts/test.make
diff --git a/regtest/rt36/Makefile b/regtest/rt36/Makefile
diff --git a/regtest/rt36/Makefile b/regtest/rt36/Makefile
@@ -0,0 +1 @@
+include ../scripts/test.make
diff --git a/regtest/rt37/Makefile b/regtest/rt37/Makefile
@@ -1,13 +1 @@
-
-test:
-	../scripts/run
-
-reset:
-	../scripts/reset
-
-clean:
-	rm -fr tmp/ report.txt
-
-valgrind:
-	../scripts/run --valgrind
-
+include ../scripts/test.make
diff --git a/regtest/rt38/Makefile b/regtest/rt38/Makefile
@@ -1,13 +1 @@
-
-test:
-	../scripts/run
-
-reset:
-	../scripts/reset
-
-clean:
-	rm -fr tmp/ report.txt
-
-valgrind:
-	../scripts/run --valgrind
-
+include ../scripts/test.make
diff --git a/regtest/rt39/Makefile b/regtest/rt39/Makefile
@@ -1,13 +1 @@
-
-test:
-	../scripts/run
-
-reset:
-	../scripts/reset
-
-clean:
-	rm -fr tmp/ report.txt
-
-valgrind:
-	../scripts/run --valgrind
-
+include ../scripts/test.make
diff --git a/regtest/rt4/Makefile b/regtest/rt4/Makefile
diff --git a/regtest/rt4/Makefile b/regtest/rt4/Makefile
@@ -0,0 +1 @@
+include ../scripts/test.make
diff --git a/regtest/rt40/Makefile b/regtest/rt40/Makefile
@@ -1,13 +1 @@
-
-test:
-	../scripts/run
-
-reset:
-	../scripts/reset
-
-clean:
-	rm -fr tmp/ report.txt
-
-valgrind:
-	../scripts/run --valgrind
-
+include ../scripts/test.make
diff --git a/regtest/rt41/Makefile b/regtest/rt41/Makefile
diff --git a/regtest/rt41/Makefile b/regtest/rt41/Makefile
@@ -0,0 +1 @@
+include ../scripts/test.make
diff --git a/regtest/rt42/Makefile b/regtest/rt42/Makefile
@@ -1,13 +1 @@
-
-test:
-	../scripts/run
-
-reset:
-	../scripts/reset
-
-clean:
-	rm -fr tmp/ report.txt
-
-valgrind:
-	../scripts/run --valgrind
-
+include ../scripts/test.make
diff --git a/regtest/rt5/Makefile b/regtest/rt5/Makefile
diff --git a/regtest/rt5/Makefile b/regtest/rt5/Makefile
@@ -0,0 +1 @@
+include ../scripts/test.make
diff --git a/regtest/rt6/Makefile b/regtest/rt6/Makefile
diff --git a/regtest/rt6/Makefile b/regtest/rt6/Makefile
@@ -0,0 +1 @@
+include ../scripts/test.make
diff --git a/regtest/rt7/Makefile b/regtest/rt7/Makefile
diff --git a/regtest/rt7/Makefile b/regtest/rt7/Makefile
@@ -0,0 +1 @@
+include ../scripts/test.make
diff --git a/regtest/rt8/Makefile b/regtest/rt8/Makefile
diff --git a/regtest/rt8/Makefile b/regtest/rt8/Makefile
@@ -0,0 +1 @@
+include ../scripts/test.make
diff --git a/regtest/rt9/Makefile b/regtest/rt9/Makefile
diff --git a/regtest/rt9/Makefile b/regtest/rt9/Makefile
@@ -0,0 +1 @@
+include ../scripts/test.make