Merge branch 'qa/out_of_source_build' into 'master'

a few fixes to permit out of source builds for unit tests

There are still issues to be fixed in the tests themselves, see !198

See merge request !199

configure.ac

@@ -461,6 +461,12 @@ AM_CONDITIONAL([HAVE_DOXYGEN], [test "$ac_cv_path_ac_pt_DX_DOXYGEN" != ""])
 
 # Handle .in files.
 AC_CONFIG_FILES([Makefile src/Makefile examples/Makefile doc/Makefile doc/Doxyfile tests/Makefile])
+AC_CONFIG_FILES([tests/testReading.sh], [chmod +x tests/testReading.sh])
+AC_CONFIG_FILES([tests/testPair.sh], [chmod +x tests/testPair.sh])
+AC_CONFIG_FILES([tests/testPairPerturbed.sh], [chmod +x tests/testPairPerturbed.sh])
+AC_CONFIG_FILES([tests/test27cells.sh], [chmod +x tests/test27cells.sh])
+AC_CONFIG_FILES([tests/test27cellsPerturbed.sh], [chmod +x tests/test27cellsPerturbed.sh])
+AC_CONFIG_FILES([tests/testParser.sh], [chmod +x tests/testParser.sh])
 
 # Report general configuration.
 AC_MSG_RESULT([

tests/Makefile.am

@@ -15,7 +15,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 # Add the source directory and debug to CFLAGS
-AM_CFLAGS = -I../src $(HDF5_CPPFLAGS) -DTIMER
+AM_CFLAGS = -I$(top_srcdir)/src $(HDF5_CPPFLAGS) -DTIMER
 
 
 AM_LDFLAGS = ../src/.libs/libswiftsim.a $(HDF5_LDFLAGS) $(HDF5_LIBS)

tests/test27cells.sh → tests/test27cells.sh.in

@@ -3,6 +3,6 @@ rm brute_force_27_standard.dat swift_dopair_27_standard.dat
 
 ./test27cells -p 6 -r 1 -d 0 -f standard
 
-python difffloat.py brute_force_27_standard.dat swift_dopair_27_standard.dat tolerance.dat 6
+python @srcdir@/difffloat.py brute_force_27_standard.dat swift_dopair_27_standard.dat @srcdir@/tolerance.dat 6
 
 exit $?

tests/test27cellsPerturbed.sh → tests/test27cellsPerturbed.sh.in

@@ -3,6 +3,6 @@ rm brute_force_27_perturbed.dat swift_dopair_27_perturbed.dat
 
 ./test27cells -p 6 -r 1 -d 0.1 -f perturbed
 
-python difffloat.py brute_force_27_perturbed.dat swift_dopair_27_perturbed.dat tolerance.dat 6
+python @srcdir@/difffloat.py brute_force_27_perturbed.dat swift_dopair_27_perturbed.dat @srcdir@/tolerance.dat 6
 
 exit $?

tests/testPair.sh → tests/testPair.sh.in

@@ -3,6 +3,6 @@ rm brute_force_standard.dat swift_dopair_standard.dat
 
 ./testPair -p 6 -r 1 -d 0 -f standard
 
-python difffloat.py brute_force_standard.dat swift_dopair_standard.dat tolerance.dat
+python @srcdir@/difffloat.py brute_force_standard.dat swift_dopair_standard.dat @srcdir@/tolerance.dat
 
 exit $?

tests/testPairPerturbed.sh → tests/testPairPerturbed.sh.in

@@ -3,6 +3,6 @@ rm brute_force_perturbed.dat swift_dopair_perturbed.dat
 
 ./testPair -p 6 -r 1 -d 0.1 -f perturbed
 
-python difffloat.py brute_force_perturbed.dat swift_dopair_perturbed.dat tolerance.dat
+python @srcdir@/difffloat.py brute_force_perturbed.dat swift_dopair_perturbed.dat @srcdir@/tolerance.dat
 
 exit $?

tests/testParser.sh → tests/testParser.sh.in

 #!/bin/bash
 
 rm parser_output.yml
-./testParser testParserInput.yaml
+./testParser @srcdir@/testParserInput.yaml

tests/testReading.sh → tests/testReading.sh.in

 #!/bin/bash
 
-python makeInput.py
+python @srcdir@/makeInput.py
 ./testReading