aboutsummaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorThomas White <taw@physics.org>2018-06-11 17:13:26 +0200
committerThomas White <taw@physics.org>2018-06-11 17:13:26 +0200
commit1d2e4eaba76977e5a169eb5466e5690b56320cb9 (patch)
treeee7fe3f7a17772f99fbecacd5349e48924a172a0 /tests
parent1bb822001ee92a5d73f20ae8f6ccaf2c29947144 (diff)
Use different temporary filenames for partialator merge checks
...because they might be run in parallel.
Diffstat (limited to 'tests')
-rwxr-xr-xtests/partialator_merge_check_16
-rwxr-xr-xtests/partialator_merge_check_24
-rwxr-xr-xtests/partialator_merge_check_34
3 files changed, 7 insertions, 7 deletions
diff --git a/tests/partialator_merge_check_1 b/tests/partialator_merge_check_1
index 0123e391..d59d128f 100755
--- a/tests/partialator_merge_check_1
+++ b/tests/partialator_merge_check_1
@@ -45,13 +45,13 @@ EOF
partialator -i partialator_merge_check_1.stream \
-o partialator_merge_check_1.hkl \
--model=unity --iterations=0 --no-scale --no-polarisation \
- --no-logs
+ --no-logs --no-free
if [ $? -ne 0 ]; then
exit 1
fi
-sed -n '/End of reflections/q;p' partialator_merge_check_1.hkl > temp.hkl
-mv temp.hkl partialator_merge_check_1.hkl
+sed -n '/End of reflections/q;p' partialator_merge_check_1.hkl > temp1.hkl
+mv temp1.hkl partialator_merge_check_1.hkl
diff partialator_merge_check_1.hkl partialator_merge_check_1_ans.hkl
if [ $? -ne 0 ]; then
exit 1
diff --git a/tests/partialator_merge_check_2 b/tests/partialator_merge_check_2
index e8aff651..2eabc300 100755
--- a/tests/partialator_merge_check_2
+++ b/tests/partialator_merge_check_2
@@ -54,8 +54,8 @@ if [ $? -ne 0 ]; then
exit 1
fi
-sed -n '/End of reflections/q;p' partialator_merge_check_2.hkl > temp.hkl
-mv temp.hkl partialator_merge_check_2.hkl
+sed -n '/End of reflections/q;p' partialator_merge_check_2.hkl > temp2.hkl
+mv temp2.hkl partialator_merge_check_2.hkl
diff partialator_merge_check_2.hkl partialator_merge_check_2_ans.hkl
if [ $? -ne 0 ]; then
exit 1
diff --git a/tests/partialator_merge_check_3 b/tests/partialator_merge_check_3
index b24b6d53..25f95756 100755
--- a/tests/partialator_merge_check_3
+++ b/tests/partialator_merge_check_3
@@ -56,8 +56,8 @@ if [ $? -ne 0 ]; then
exit 1
fi
-sed -n '/End\ of\ reflections/q;p' partialator_merge_check_3.hkl > temp.hkl
-mv temp.hkl partialator_merge_check_3.hkl
+sed -n '/End\ of\ reflections/q;p' partialator_merge_check_3.hkl > temp3.hkl
+mv temp3.hkl partialator_merge_check_3.hkl
diff partialator_merge_check_3.hkl partialator_merge_check_3_ans.hkl
if [ $? -ne 0 ]; then
exit 1