diff --git a/check-linuxcnc-workstreams-source-map.sh b/check-linuxcnc-workstreams-source-map.sh index bf7d258..d574a39 100755 --- a/check-linuxcnc-workstreams-source-map.sh +++ b/check-linuxcnc-workstreams-source-map.sh @@ -121,8 +121,6 @@ for workstream, paths in expected.items(): for test_entry in ["test-native.sh", "test-linuxcnc-source-link.sh"]: text = Path(test_entry).read_text(encoding="utf-8") for guard in sorted({path for paths in expected.values() for path in paths if path.startswith("check-")}): - if guard in {"check-linuxcnc-wasm-shims-source-map.sh", "check-linuxcnc-wasm-blockers-source-map.sh"}: - continue if f"./{guard}" not in text: raise SystemExit(f"{test_entry} does not run workstream source-map guard: {guard}") PY diff --git a/test-all-native.sh b/test-all-native.sh index d0adfa0..b46d4cb 100755 --- a/test-all-native.sh +++ b/test-all-native.sh @@ -166,7 +166,11 @@ grep -F 'LinuxCNC source basis: this guard ties LinuxCNC tooldata/Submakefile' c grep -F './check-linuxcnc-tooldata-source-map.sh' test-native.sh >/dev/null grep -F './check-linuxcnc-tooldata-source-map.sh' test-linuxcnc-source-link.sh >/dev/null grep -F 'LinuxCNC source basis: this guard ties the documented WASM blocker map' check-linuxcnc-wasm-blockers-source-map.sh >/dev/null +grep -F './check-linuxcnc-wasm-blockers-source-map.sh' test-native.sh >/dev/null +grep -F './check-linuxcnc-wasm-blockers-source-map.sh' test-linuxcnc-source-link.sh >/dev/null grep -F 'LinuxCNC source basis: this guard ties the documented wasm-safe shim map' check-linuxcnc-wasm-shims-source-map.sh >/dev/null +grep -F './check-linuxcnc-wasm-shims-source-map.sh' test-native.sh >/dev/null +grep -F './check-linuxcnc-wasm-shims-source-map.sh' test-linuxcnc-source-link.sh >/dev/null grep -F 'LinuxCNC source basis: the cached input checker keys check-linuxcnc-inputs.sh' check-linuxcnc-inputs-cached.sh >/dev/null grep -F 'LinuxCNC source basis: switchkins/remap table validation derives M428/M429/M430' check-linuxcnc-switchkins-remap-table.sh >/dev/null grep -F 'LINUXCNC_ROOT="$linuxcnc_root" ./check-linuxcnc-inputs-cached.sh "$manifest" --require-kinematics-complete' check-linuxcnc-switchkins-remap-table.sh >/dev/null diff --git a/test-linuxcnc-source-link.sh b/test-linuxcnc-source-link.sh index 30f6f30..bf7e434 100755 --- a/test-linuxcnc-source-link.sh +++ b/test-linuxcnc-source-link.sh @@ -45,6 +45,8 @@ LINUXCNC_ROOT="$linuxcnc_root" ./check-linuxcnc-inputs-cached.sh --cache-dir "$p ./check-linuxcnc-browser-app-source-map.sh ./check-linuxcnc-workstreams-source-map.sh ./check-linuxcnc-tooldata-source-map.sh +./check-linuxcnc-wasm-shims-source-map.sh +./check-linuxcnc-wasm-blockers-source-map.sh LINUXCNC_ROOT="$linuxcnc_root" ./check-linuxcnc-switchkins-remap-table-cached.sh --cache-dir "$preflight_cache_dir" linuxcnc-kinematics-source-files.txt # The LinuxCNC source-linked dump path is not concurrency-safe under parallel execution. exec 9>"${TMPDIR:-/tmp}/cnc_sim_rs274_source_link.lock" diff --git a/test-native.sh b/test-native.sh index c5d5812..cff0859 100755 --- a/test-native.sh +++ b/test-native.sh @@ -43,6 +43,8 @@ preflight_cache_dir="$build_dir/preflight-cache" ./check-linuxcnc-browser-app-source-map.sh ./check-linuxcnc-workstreams-source-map.sh ./check-linuxcnc-tooldata-source-map.sh +./check-linuxcnc-wasm-shims-source-map.sh +./check-linuxcnc-wasm-blockers-source-map.sh ./check-linuxcnc-switchkins-remap-table-cached.sh --cache-dir "$preflight_cache_dir" linuxcnc-kinematics-source-files.txt grep -F 'tooldata:src/emc/tooldata/tooldata_nml.cc:NML tool table backend selected by LinuxCNC TOOL_NML_FLAG' linuxcnc-rs274-source-files.txt >/dev/null grep -F 'tooldata:src/emc/tooldata/tool_mmap_read.cc:LinuxCNC tooldata mmap reader utility source from tooldata Submakefile' linuxcnc-rs274-source-files.txt >/dev/null