From b4f68711dad72584bb978d57941b1d29e72d5aed Mon Sep 17 00:00:00 2001
From: Matthieu Schaller <matthieu.schaller@durham.ac.uk>
Date: Sat, 13 May 2017 12:38:20 +0100
Subject: [PATCH] Correctly added the perturbed version of the test125cells.
---
.gitignore | 1 +
configure.ac | 1 +
tests/Makefile.am | 2 +-
tests/test125cellsPerturbed.sh | 24 ------------------------
tests/test125cellsPerturbed.sh.in | 2 +-
5 files changed, 4 insertions(+), 26 deletions(-)
delete mode 100755 tests/test125cellsPerturbed.sh
diff --git a/.gitignore b/.gitignore
index 7d6d9021f1..a9138619c1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -65,6 +65,7 @@ tests/parser_output.yml
tests/test27cells.sh
tests/test27cellsPerturbed.sh
tests/test125cells.sh
+tests/test125cellsPerturbed.sh
tests/testPair.sh
tests/testPairPerturbed.sh
tests/testParser.sh
diff --git a/configure.ac b/configure.ac
index 8a2d0f30ae..788bb57eed 100644
--- a/configure.ac
+++ b/configure.ac
@@ -853,6 +853,7 @@ AC_CONFIG_FILES([tests/testPairPerturbed.sh], [chmod +x tests/testPairPerturbed.
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/test125cells.sh], [chmod +x tests/test125cells.sh])
+AC_CONFIG_FILES([tests/test125cellsPerturbed.sh], [chmod +x tests/test125cellsPerturbed.sh])
AC_CONFIG_FILES([tests/testParser.sh], [chmod +x tests/testParser.sh])
# Save the compilation options
diff --git a/tests/Makefile.am b/tests/Makefile.am
index d33853a8dc..5643180f47 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -92,6 +92,6 @@ testLogger_SOURCES = testLogger.c
# Files necessary for distribution
EXTRA_DIST = testReading.sh makeInput.py testPair.sh testPairPerturbed.sh \
test27cells.sh test27cellsPerturbed.sh testParser.sh \
- test125cells.sh test125cells.sh testParserInput.yaml difffloat.py \
+ test125cells.sh test125cellsPerturbed.sh testParserInput.yaml difffloat.py \
tolerance_125.dat tolerance_27_normal.dat tolerance_27_perturbed.dat \
tolerance_pair_normal.dat tolerance_pair_perturbed.dat
diff --git a/tests/test125cellsPerturbed.sh b/tests/test125cellsPerturbed.sh
deleted file mode 100755
index 79005fe655..0000000000
--- a/tests/test125cellsPerturbed.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/bash
-for v in {0..3}
-do
- for p in {0..2}
- do
- echo ""
-
- rm -f brute_force_125_perturbed.dat swift_dopair_125_perturbed.dat
-
- echo "./test125cells -n 6 -r 1 -d 0.1 -v $v -p $p -f perturbed"
-
- ./test125cells -n 6 -r 1 -d 0.1 -v $v -p $p -f perturbed
-
- if [ -e brute_force_125_perturbed.dat ]
- then
- python ./difffloat.py brute_force_125_perturbed.dat swift_dopair_125_perturbed.dat ./tolerance_125_perturbed.dat 6
- else
- exit 1
- fi
-
- done
-done
-
-exit $?
diff --git a/tests/test125cellsPerturbed.sh.in b/tests/test125cellsPerturbed.sh.in
index a59c77b7f6..f5fbb99dc0 100755
--- a/tests/test125cellsPerturbed.sh.in
+++ b/tests/test125cellsPerturbed.sh.in
@@ -20,5 +20,5 @@ do
done
done
-
+
exit $?
--
GitLab