Move tests

configure.ac

@@ -21,6 +21,7 @@ LIBS="$DUNE_LIBS"
 AC_CONFIG_FILES([
   Makefile
   src/Makefile
+  src/tests/Makefile
   doc/Makefile
   doc/doxygen/Makefile
   doc/doxygen/Doxyfile

src/Makefile.am

-check_PROGRAMS = \
-	test-circle-1 \
-	test-circle-10 \
-	test-gradient-horrible \
-	test-gradient-horrible-logarithmic \
-	test-gradient-identity \
-	test-gradient-kinks \
-	test-gradient-parabola \
-	test-gradient-sample \
-	test-gradient-sample-3d \
-	test-gradient-sample-nonsmooth \
-	test-gradient-sample-steep \
-	test-gradient-sample-steep2 \
-	test-gradient-sample-verysteep \
-	test-gradient-sample2 \
-	test-gradient-trivial \
-	test-minimise2
-
-test_circle_1_SOURCES                      = test-circle.cc
-test_circle_1_CPPFLAGS                     = $(AM_CPPFLAGS) -DDUNE_TECTONIC_TEST_CIRCLE_SCALE=1
-test_circle_10_SOURCES                     = test-circle.cc
-test_circle_10_CPPFLAGS                    = $(AM_CPPFLAGS) -DDUNE_TECTONIC_TEST_CIRCLE_SCALE=10
-test_gradient_horrible_SOURCES             = test-gradient-horrible.cc
-test_gradient_horrible_logarithmic_SOURCES = test-gradient-horrible-logarithmic.cc
-test_gradient_identity_SOURCES             = test-gradient-identity.cc
-test_gradient_kinks_SOURCES                = test-gradient-kinks.cc
-test_gradient_parabola_SOURCES             = test-gradient-parabola.cc
-test_gradient_sample_SOURCES               = test-gradient-sample.cc
-test_gradient_sample_3d_SOURCES            = test-gradient-sample-3d.cc
-test_gradient_sample_nonsmooth_SOURCES     = test-gradient-sample-nonsmooth.cc
-test_gradient_sample_steep_SOURCES         = test-gradient-sample-steep.cc
-test_gradient_sample_steep2_SOURCES        = test-gradient-sample-steep2.cc
-test_gradient_sample_verysteep_SOURCES     = test-gradient-sample-verysteep.cc
-test_gradient_sample2_SOURCES              = test-gradient-sample2.cc
-test_gradient_trivial_SOURCES              = test-gradient-trivial.cc
-test_minimise2_SOURCES                     = test-minimise2.cc
+SUBDIRS = tests
 
 bin_PROGRAMS = \
 	one-body-sample-2D \
@@ -95,8 +60,6 @@ one_body_sample_3D_SOURCES = \
 one_body_sample_3D_CPPFLAGS = \
 	$(AM_CPPFLAGS) -Dsrcdir=\"$(srcdir)\" -DDIM=3
 
-TESTS = $(check_PROGRAMS)
-
 # Some are for clang, others are for gcc
 AM_CXXFLAGS = \
 	-Wall \

src/tests/Makefile.am

+check_PROGRAMS = \
+	test-circle-1 \
+	test-circle-10 \
+	test-gradient-horrible \
+	test-gradient-horrible-logarithmic \
+	test-gradient-identity \
+	test-gradient-kinks \
+	test-gradient-parabola \
+	test-gradient-sample \
+	test-gradient-sample-3d \
+	test-gradient-sample-nonsmooth \
+	test-gradient-sample-steep \
+	test-gradient-sample-steep2 \
+	test-gradient-sample-verysteep \
+	test-gradient-sample2 \
+	test-gradient-trivial \
+	test-minimise2
+
+test_circle_1_SOURCES                      = test-circle.cc
+test_circle_1_CPPFLAGS                     = $(AM_CPPFLAGS) -DDUNE_TECTONIC_TEST_CIRCLE_SCALE=1
+test_circle_10_SOURCES                     = test-circle.cc
+test_circle_10_CPPFLAGS                    = $(AM_CPPFLAGS) -DDUNE_TECTONIC_TEST_CIRCLE_SCALE=10
+test_gradient_horrible_SOURCES             = test-gradient-horrible.cc
+test_gradient_horrible_logarithmic_SOURCES = test-gradient-horrible-logarithmic.cc
+test_gradient_identity_SOURCES             = test-gradient-identity.cc
+test_gradient_kinks_SOURCES                = test-gradient-kinks.cc
+test_gradient_parabola_SOURCES             = test-gradient-parabola.cc
+test_gradient_sample_SOURCES               = test-gradient-sample.cc
+test_gradient_sample_3d_SOURCES            = test-gradient-sample-3d.cc
+test_gradient_sample_nonsmooth_SOURCES     = test-gradient-sample-nonsmooth.cc
+test_gradient_sample_steep_SOURCES         = test-gradient-sample-steep.cc
+test_gradient_sample_steep2_SOURCES        = test-gradient-sample-steep2.cc
+test_gradient_sample_verysteep_SOURCES     = test-gradient-sample-verysteep.cc
+test_gradient_sample2_SOURCES              = test-gradient-sample2.cc
+test_gradient_trivial_SOURCES              = test-gradient-trivial.cc
+test_minimise2_SOURCES                     = test-minimise2.cc
+
+TESTS = $(check_PROGRAMS)
+
+AM_CPPFLAGS = \
+	$(DUNE_CPPFLAGS) \
+	$(PYTHON_CPPFLAGS) \
+	$(ALUGRID_CPPFLAGS) \
+	-I$(top_srcdir)