diff options
| -rw-r--r-- | org/spine.org | 9 | ||||
| -rw-r--r-- | org/tests_for_document_abstraction_shell_scripts.org | 8 | ||||
| -rw-r--r-- | src/sisudoc/spine.d | 9 | ||||
| -rwxr-xr-x | test/test-abstraction-ssp.sh | 8 |
4 files changed, 26 insertions, 8 deletions
diff --git a/org/spine.org b/org/spine.org index 86003b9..b60fd8d 100644 --- a/org/spine.org +++ b/org/spine.org @@ -1044,7 +1044,16 @@ struct OptActions { _is = false; } } else if ( + /+ ↓ show_abstraction and ocda_db belong here for the same reason as + the rest: each writes one file per document per language and + shares no handle. --pod2 and --source, which also set + show_abstraction, and the shared sqlite db actions are taken out + by the guard above before this list is reached, so listing them + here does not parallelise those + +/ opts["abstraction"] + || show_abstraction + || ocda_db || concordance || curate || html diff --git a/org/tests_for_document_abstraction_shell_scripts.org b/org/tests_for_document_abstraction_shell_scripts.org index 932f1cd..199e109 100644 --- a/org/tests_for_document_abstraction_shell_scripts.org +++ b/org/tests_for_document_abstraction_shell_scripts.org @@ -232,10 +232,10 @@ fi echo "Generating current .ssp files..." rm -rf "$TMP_DIR" mkdir -p "$TMP_DIR" -# --abstraction is what puts this run in parallel: --show-abstraction on its -# own does not appear in spine's parallelise() list, so it runs serially and -# the parallel-vs-serial comparison below would compare a serial run with -# itself. Do not drop it. +# 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 # flatten find "$SCRIPT_DIR/current" -name "*.ssp" ! -path "$TMP_DIR/*" -exec mv {} "$TMP_DIR/" \; diff --git a/src/sisudoc/spine.d b/src/sisudoc/spine.d index 2862303..ed55298 100644 --- a/src/sisudoc/spine.d +++ b/src/sisudoc/spine.d @@ -831,7 +831,16 @@ string program_name = "spine"; _is = false; } } else if ( + /+ ↓ show_abstraction and ocda_db belong here for the same reason as + the rest: each writes one file per document per language and + shares no handle. --pod2 and --source, which also set + show_abstraction, and the shared sqlite db actions are taken out + by the guard above before this list is reached, so listing them + here does not parallelise those + +/ opts["abstraction"] + || show_abstraction + || ocda_db || concordance || curate || html diff --git a/test/test-abstraction-ssp.sh b/test/test-abstraction-ssp.sh index bb44d1c..3b2217b 100755 --- a/test/test-abstraction-ssp.sh +++ b/test/test-abstraction-ssp.sh @@ -104,10 +104,10 @@ fi echo "Generating current .ssp files..." rm -rf "$TMP_DIR" mkdir -p "$TMP_DIR" -# --abstraction is what puts this run in parallel: --show-abstraction on its -# own does not appear in spine's parallelise() list, so it runs serially and -# the parallel-vs-serial comparison below would compare a serial run with -# itself. Do not drop it. +# 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 # flatten find "$SCRIPT_DIR/current" -name "*.ssp" ! -path "$TMP_DIR/*" -exec mv {} "$TMP_DIR/" \; |