From 1a80c16529df317ea762f228b648e2616c6c697d Mon Sep 17 00:00:00 2001 From: Matthieu Schaller <matthieu.schaller@durham.ac.uk> Date: Mon, 26 Oct 2015 10:32:33 +0000 Subject: [PATCH] Moved the test_single example to the unit test directory. --- .gitignore | 18 +++++++++++------- examples/Makefile.am | 7 +------ tests/Makefile.am | 10 +++++++--- examples/test_single.c => tests/testSingle.c | 0 4 files changed, 19 insertions(+), 16 deletions(-) rename examples/test_single.c => tests/testSingle.c (100%) diff --git a/.gitignore b/.gitignore index 3a8146ae84..d69de3deae 100644 --- a/.gitignore +++ b/.gitignore @@ -18,13 +18,17 @@ doc/html/ doc/latex/ doc/man/ doc/Doxyfile -examples/test -examples/test_fixdt -examples/test_fixdt_mpi -examples/test_mindt -examples/test_mindt_mpi -examples/test_mpi -examples/test_single +examples/swift +examples/swift_fixdt +examples/swift_fixdt_mpi +examples/swift_mindt +examples/swift_mindt_mpi +examples/swift_mpi + +tests/testGreetings +tests/testReading +tests/input.hdf5 +tests/testSingle m4/libtool.m4 m4/ltoptions.m4 diff --git a/examples/Makefile.am b/examples/Makefile.am index 7617b7e40b..c346e01739 100644 --- a/examples/Makefile.am +++ b/examples/Makefile.am @@ -29,7 +29,7 @@ MPI_LIBS = $(METIS_LIBS) $(MPI_THREAD_LIBS) MPI_FLAGS = -DWITH_MPI $(METIS_INCS) # Set-up the library -bin_PROGRAMS = swift swift_fixdt swift_mindt test_single +bin_PROGRAMS = swift swift_fixdt swift_mindt # Build MPI versions as well? if HAVEMPI @@ -66,8 +66,3 @@ swift_mindt_mpi_SOURCES = main.c swift_mindt_mpi_CFLAGS = $(MYFLAGS) $(AM_CFLAGS) $(MPI_FLAGS) -DENGINE_POLICY="engine_policy_keep" swift_mindt_mpi_LDADD = ../src/.libs/libswiftsim_mpi.a $(HDF5_LDFLAGS) $(HDF5_LIBS) $(MPI_LIBS) -# Sources for test_single -test_single_SOURCES = test_single.c -test_single_CFLAGS = $(MYFLAGS) $(AM_CFLAGS) -test_single_LDADD = ../src/.libs/libswiftsim.a $(HDF5_LDFLAGS) $(HDF5_LIBS) - diff --git a/tests/Makefile.am b/tests/Makefile.am index 4df125851e..13c654cdec 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -20,13 +20,17 @@ AM_CFLAGS = -I../src -DCPU_TPS=2.67e9 $(HDF5_CPPFLAGS) AM_LDFLAGS = ../src/.libs/libswiftsim.a $(HDF5_LDFLAGS) $(HDF5_LIBS) # List of programs and scripts to run in the test suite -TESTS = testGreetings testReading.sh - +TESTS = testGreetings testReading.sh testSingle # List of test programs to compile -check_PROGRAMS = testGreetings testReading +check_PROGRAMS = testGreetings testReading testSingle # Sources for the individual programs testGreetings_SOURCES = testGreetings.c testReading_SOURCES = testReading.c + +# Sources for test_single +testSingle_SOURCES = testSingle.c +testSingle_CFLAGS = $(MYFLAGS) $(AM_CFLAGS) +testSingle_LDADD = ../src/.libs/libswiftsim.a $(HDF5_LDFLAGS) $(HDF5_LIBS) diff --git a/examples/test_single.c b/tests/testSingle.c similarity index 100% rename from examples/test_single.c rename to tests/testSingle.c -- GitLab