Isolate managed precompile race validation

scripts/test_parallel_precompile.sh

@@ -3,34 +3,32 @@ set -euo pipefail
 cd "$(dirname "$0")/.."
 
 test_name="parallel-precompile-test-$$"
-site_directory="site"
-bin_directory="/tmp/uce/work"
-if [[ -r /etc/uce/settings.cfg ]]; then
-	configured_precompile=$(awk -F= '/^[[:space:]]*PRECOMPILE_FILES_IN[[:space:]]*=/ {sub(/^[^=]*=/, ""); gsub(/^[[:space:]]+|[[:space:]]+$/, ""); print; exit}' /etc/uce/settings.cfg)
-	configured_site=$(awk -F= '/^[[:space:]]*SITE_DIRECTORY[[:space:]]*=/ {sub(/^[^=]*=/, ""); gsub(/^[[:space:]]+|[[:space:]]+$/, ""); print; exit}' /etc/uce/settings.cfg)
-	configured_bin=$(awk -F= '/^[[:space:]]*BIN_DIRECTORY[[:space:]]*=/ {sub(/^[^=]*=/, ""); gsub(/^[[:space:]]+|[[:space:]]+$/, ""); print; exit}' /etc/uce/settings.cfg)
-	site_directory="${configured_precompile:-${configured_site:-$site_directory}}"
-	bin_directory="${configured_bin:-$bin_directory}"
-fi
-
-source_dir="$site_directory/$test_name"
+test_root="/tmp/$test_name"
+source_dir="$test_root/site"
+bin_directory="$test_root/work"
 absolute_source_dir=""
 artifact_dir=""
 generation_log=""
+generation_pid=""
 precompile_timeout="${UCE_TEST_PRECOMPILE_TIMEOUT:-120s}"
 
 precompile() {
-	timeout "$precompile_timeout" env "$@" bin/uce_fastcgi.linux.bin --precompile
+	timeout "$precompile_timeout" env UCE_PRECOMPILE_FILES_IN="$source_dir" UCE_PRECOMPILE_BIN_DIRECTORY="$bin_directory" "$@" bin/uce_fastcgi.linux.bin --precompile
 }
 
 cleanup() {
-	rm -rf "$source_dir"
-	if [[ -x bin/uce_fastcgi.linux.bin ]]; then
-		precompile UCE_PRECOMPILE_JOBS=1 >/dev/null 2>&1 || true
-	fi
-	if [[ -n "$artifact_dir" ]]; then
-		rm -rf "$artifact_dir"
+	if [[ -n "$generation_pid" ]] && kill -0 "$generation_pid" 2>/dev/null; then
+		kill "$generation_pid" 2>/dev/null || true
+		cleanup_deadline=$((SECONDS + 10))
+		while kill -0 "$generation_pid" 2>/dev/null && (( SECONDS < cleanup_deadline )); do
+			sleep 0.05
+		done
+		if kill -0 "$generation_pid" 2>/dev/null; then
+			kill -KILL "$generation_pid" 2>/dev/null || true
+		fi
+		wait "$generation_pid" 2>/dev/null || true
 	fi
+	rm -rf "$test_root"
 	if [[ -n "$generation_log" ]]; then
 		rm -f "$generation_log"
 	fi
@@ -124,18 +122,23 @@ set +e
 wait "$generation_pid"
 generation_rc=$?
 set -e
+generation_pid=""
 if [[ $generation_rc -eq 0 ]] || ! grep -q 'source generation changed during precompile; candidate generation rejected' "$generation_log"; then
 	echo "parallel precompile accepted a source generation that changed during compilation" >&2
 	cat "$generation_log" >&2
 	exit 1
 fi
+if [[ -e "$artifact_dir/generation-new.uce.wasm" || -e "$artifact_dir/generation-new.uce.cwasm" ]]; then
+	echo "parallel precompile published an added unit outside the rejected candidate source set" >&2
+	exit 1
+fi
 generation_retry_output=$(precompile UCE_PRECOMPILE_JOBS=2 UCE_WASM_PCH_DIR="$artifact_dir/pch-shared")
 if ! grep -Eq 'with 2 jobs: .* 2 compiled, 0 failed, worker status ok' <<<"$generation_retry_output"; then
 	echo "parallel precompile did not reconcile the changed and added units on retry" >&2
 	echo "$generation_retry_output" >&2
 	exit 1
 fi
-rm -f "$generation_log" "$source_dir"/generation-*.uce
+rm -f "$generation_log"
 
 printf 'CLI(Request& context) { print(deliberate_parallel_precompile_failure); }\n' >"$source_dir/broken.uce"
 set +e
@@ -158,13 +161,18 @@ if [[ $repeat_failure_rc -eq 0 ]] || ! grep -Eq 'with 2 jobs: .* 1 failed, worke
 fi
 rm "$source_dir/broken.uce"
 
+rm -f "$source_dir"/unit-*.uce
+for unit in $(seq -w 0 4); do
+	printf 'CLI(Request& context) { print("parallel-precompile-bounds-%s"); }\n' "$unit" >"$source_dir/bounds-$unit.uce"
+done
 negative_jobs_output=$(precompile UCE_PRECOMPILE_JOBS=-1)
 malformed_jobs_output=$(precompile UCE_PRECOMPILE_JOBS=invalid)
 oversized_jobs_output=$(precompile UCE_PRECOMPILE_JOBS=17)
-if ! grep -q 'with 1 job:' <<<"$negative_jobs_output" || ! grep -q 'with 2 jobs:' <<<"$malformed_jobs_output" || ! grep -q 'with 16 jobs:' <<<"$oversized_jobs_output"; then
+if ! grep -q 'with 1 job: 16 units,' <<<"$negative_jobs_output" || ! grep -q 'with 2 jobs: 16 units,' <<<"$malformed_jobs_output" || ! grep -q 'with 16 jobs: 16 units,' <<<"$oversized_jobs_output"; then
 	echo "precompile job bounds did not map negative/malformed/oversized input to 1/2/16" >&2
 	exit 1
 fi
+rm -f "$source_dir"/bounds-*.uce "$source_dir"/generation-*.uce
 
 printf 'parallel precompile passed: serial %.3fs, parallel %.3fs\n' \
 	"$(awk -v ns="$serial_ns" 'BEGIN { print ns / 1000000000 }')" \