aboutsummaryrefslogtreecommitdiffhomepage
path: root/test/test-abstraction-ssp.sh
diff options
context:
space:
mode:
Diffstat (limited to 'test/test-abstraction-ssp.sh')
-rwxr-xr-xtest/test-abstraction-ssp.sh9
1 files changed, 5 insertions, 4 deletions
diff --git a/test/test-abstraction-ssp.sh b/test/test-abstraction-ssp.sh
index 3b2217b..b63c6e4 100755
--- a/test/test-abstraction-ssp.sh
+++ b/test/test-abstraction-ssp.sh
@@ -105,10 +105,11 @@ echo "Generating current .ssp files..."
rm -rf "$TMP_DIR"
mkdir -p "$TMP_DIR"
# this run has to be the parallel one: the serial run below is what it is
-# compared against, and two serial runs compare nothing. --show-abstraction
-# now parallelises on its own, and --abstraction is kept as well so that the
-# test does not go quietly serial if that ever changes.
-$SPINE_BIN --abstraction --show-abstraction --skip-output --output="$SCRIPT_DIR/current" "$SAMPLES_DIR"/* 2>&1 | tail -1
+# compared against, and two serial runs compare nothing. Serial is spine's
+# behaviour now and --parallel is the option, so it has to be asked for
+# here by name. Drop it and this test stops guarding the .ssp write race
+# without any test failing to say so.
+$SPINE_BIN --parallel --show-abstraction --skip-output --output="$SCRIPT_DIR/current" "$SAMPLES_DIR"/* 2>&1 | tail -1
# flatten
find "$SCRIPT_DIR/current" -name "*.ssp" ! -path "$TMP_DIR/*" -exec mv {} "$TMP_DIR/" \;
find "$SCRIPT_DIR/current" -mindepth 1 -type d -empty -delete 2>/dev/null || true