From c09125ded25e85c2c5cad708c039badfe9dea53c Mon Sep 17 00:00:00 2001
From: Elias Pipping <elias.pipping@fu-berlin.de>
Date: Wed, 12 Sep 2012 22:56:09 +0200
Subject: [PATCH] Move tests
---
configure.ac | 1 +
src/Makefile.am | 39 +---------------
src/tests/Makefile.am | 44 +++++++++++++++++++
src/{ => tests}/test-circle.cc | 0
.../test-gradient-horrible-logarithmic.cc | 0
src/{ => tests}/test-gradient-horrible.cc | 0
src/{ => tests}/test-gradient-identity.cc | 0
src/{ => tests}/test-gradient-kinks.cc | 0
.../test-gradient-method-helper.hh | 0
.../test-gradient-method-nicefunction.hh | 0
src/{ => tests}/test-gradient-parabola.cc | 0
src/{ => tests}/test-gradient-sample-3d.cc | 0
.../test-gradient-sample-nonsmooth.cc | 0
src/{ => tests}/test-gradient-sample-steep.cc | 0
.../test-gradient-sample-steep2.cc | 0
.../test-gradient-sample-verysteep.cc | 0
src/{ => tests}/test-gradient-sample.cc | 0
src/{ => tests}/test-gradient-sample2.cc | 0
src/{ => tests}/test-gradient-trivial.cc | 0
src/{ => tests}/test-minimise2.cc | 0
src/{ => tests}/test_circle_1.m | 0
src/{ => tests}/test_circle_10.m | 0
22 files changed, 46 insertions(+), 38 deletions(-)
create mode 100644 src/tests/Makefile.am
rename src/{ => tests}/test-circle.cc (100%)
rename src/{ => tests}/test-gradient-horrible-logarithmic.cc (100%)
rename src/{ => tests}/test-gradient-horrible.cc (100%)
rename src/{ => tests}/test-gradient-identity.cc (100%)
rename src/{ => tests}/test-gradient-kinks.cc (100%)
rename src/{ => tests}/test-gradient-method-helper.hh (100%)
rename src/{ => tests}/test-gradient-method-nicefunction.hh (100%)
rename src/{ => tests}/test-gradient-parabola.cc (100%)
rename src/{ => tests}/test-gradient-sample-3d.cc (100%)
rename src/{ => tests}/test-gradient-sample-nonsmooth.cc (100%)
rename src/{ => tests}/test-gradient-sample-steep.cc (100%)
rename src/{ => tests}/test-gradient-sample-steep2.cc (100%)
rename src/{ => tests}/test-gradient-sample-verysteep.cc (100%)
rename src/{ => tests}/test-gradient-sample.cc (100%)
rename src/{ => tests}/test-gradient-sample2.cc (100%)
rename src/{ => tests}/test-gradient-trivial.cc (100%)
rename src/{ => tests}/test-minimise2.cc (100%)
rename src/{ => tests}/test_circle_1.m (100%)
rename src/{ => tests}/test_circle_10.m (100%)
diff --git a/configure.ac b/configure.ac
index 36ba21d8..10c51e47 100644
--- a/configure.ac
+++ b/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
diff --git a/src/Makefile.am b/src/Makefile.am
index 0777d6ee..826fb0ac 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,39 +1,4 @@
-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 \
diff --git a/src/tests/Makefile.am b/src/tests/Makefile.am
new file mode 100644
index 00000000..90342183
--- /dev/null
+++ b/src/tests/Makefile.am
@@ -0,0 +1,44 @@
+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)
diff --git a/src/test-circle.cc b/src/tests/test-circle.cc
similarity index 100%
rename from src/test-circle.cc
rename to src/tests/test-circle.cc
diff --git a/src/test-gradient-horrible-logarithmic.cc b/src/tests/test-gradient-horrible-logarithmic.cc
similarity index 100%
rename from src/test-gradient-horrible-logarithmic.cc
rename to src/tests/test-gradient-horrible-logarithmic.cc
diff --git a/src/test-gradient-horrible.cc b/src/tests/test-gradient-horrible.cc
similarity index 100%
rename from src/test-gradient-horrible.cc
rename to src/tests/test-gradient-horrible.cc
diff --git a/src/test-gradient-identity.cc b/src/tests/test-gradient-identity.cc
similarity index 100%
rename from src/test-gradient-identity.cc
rename to src/tests/test-gradient-identity.cc
diff --git a/src/test-gradient-kinks.cc b/src/tests/test-gradient-kinks.cc
similarity index 100%
rename from src/test-gradient-kinks.cc
rename to src/tests/test-gradient-kinks.cc
diff --git a/src/test-gradient-method-helper.hh b/src/tests/test-gradient-method-helper.hh
similarity index 100%
rename from src/test-gradient-method-helper.hh
rename to src/tests/test-gradient-method-helper.hh
diff --git a/src/test-gradient-method-nicefunction.hh b/src/tests/test-gradient-method-nicefunction.hh
similarity index 100%
rename from src/test-gradient-method-nicefunction.hh
rename to src/tests/test-gradient-method-nicefunction.hh
diff --git a/src/test-gradient-parabola.cc b/src/tests/test-gradient-parabola.cc
similarity index 100%
rename from src/test-gradient-parabola.cc
rename to src/tests/test-gradient-parabola.cc
diff --git a/src/test-gradient-sample-3d.cc b/src/tests/test-gradient-sample-3d.cc
similarity index 100%
rename from src/test-gradient-sample-3d.cc
rename to src/tests/test-gradient-sample-3d.cc
diff --git a/src/test-gradient-sample-nonsmooth.cc b/src/tests/test-gradient-sample-nonsmooth.cc
similarity index 100%
rename from src/test-gradient-sample-nonsmooth.cc
rename to src/tests/test-gradient-sample-nonsmooth.cc
diff --git a/src/test-gradient-sample-steep.cc b/src/tests/test-gradient-sample-steep.cc
similarity index 100%
rename from src/test-gradient-sample-steep.cc
rename to src/tests/test-gradient-sample-steep.cc
diff --git a/src/test-gradient-sample-steep2.cc b/src/tests/test-gradient-sample-steep2.cc
similarity index 100%
rename from src/test-gradient-sample-steep2.cc
rename to src/tests/test-gradient-sample-steep2.cc
diff --git a/src/test-gradient-sample-verysteep.cc b/src/tests/test-gradient-sample-verysteep.cc
similarity index 100%
rename from src/test-gradient-sample-verysteep.cc
rename to src/tests/test-gradient-sample-verysteep.cc
diff --git a/src/test-gradient-sample.cc b/src/tests/test-gradient-sample.cc
similarity index 100%
rename from src/test-gradient-sample.cc
rename to src/tests/test-gradient-sample.cc
diff --git a/src/test-gradient-sample2.cc b/src/tests/test-gradient-sample2.cc
similarity index 100%
rename from src/test-gradient-sample2.cc
rename to src/tests/test-gradient-sample2.cc
diff --git a/src/test-gradient-trivial.cc b/src/tests/test-gradient-trivial.cc
similarity index 100%
rename from src/test-gradient-trivial.cc
rename to src/tests/test-gradient-trivial.cc
diff --git a/src/test-minimise2.cc b/src/tests/test-minimise2.cc
similarity index 100%
rename from src/test-minimise2.cc
rename to src/tests/test-minimise2.cc
diff --git a/src/test_circle_1.m b/src/tests/test_circle_1.m
similarity index 100%
rename from src/test_circle_1.m
rename to src/tests/test_circle_1.m
diff --git a/src/test_circle_10.m b/src/tests/test_circle_10.m
similarity index 100%
rename from src/test_circle_10.m
rename to src/tests/test_circle_10.m
--
GitLab