Skip to content

Commit 6b621ec

Browse files
Include the configuration macro in haxelib test packages
The installation fixture copied extraParams.hxml without its new macro dependency, so compiler probes failed with Type not found before reading the version defines. Include the actual macro and archive nested fixture files. Reproduced the missing type in the Linux installation check. All installation, setup, update and off checks pass on Windows and Linux after the fixture correction.
1 parent 67208e6 commit 6b621ec

2 files changed

Lines changed: 10 additions & 2 deletions

File tree

‎bench/results/incremental-gc/README.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,8 @@ Linux under WSL, Haxe 4.3.3 and GCC 13.3 passed ASan and UBSan builds of the sli
5656

5757
The independent verifier fixture deliberately omits a reachable descendant's mark in a child process and requires rejection. The epoch recovery assertion failed before the recovery fix, and the allocation cursor assertion failed before preserving allocator ranges across partial slices.
5858

59+
The isolated haxelib installation, setup, update and off checks passed on Windows and Linux. Their synthetic package includes the configuration macro referenced by `extraParams.hxml`.
60+
5961
Local TSan did not reach a usable test run: the installed GCC runtime rejected the repository suppression syntax and, without suppressions, failed under WSL before the workload ran. TSan and other platform results remain for CI. CI configuration includes incremental regressions and stress in the sanitizer jobs and a native incremental job on supported Haxe 4 configurations.
6062

6163
## Remaining gates

‎test/haxelib/check.sh‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,15 +65,21 @@ package() {
6565
sed "s/\"version\": \"[^\"]*\"/\"version\": \"$version\"/" "$ROOT/haxelib.json" > "$dir/haxelib.json"
6666
cp "$ROOT/run.n" "$dir/"
6767
sed "s/,\"[^\"]*\")/,\"$version\")/" "$ROOT/extraParams.hxml" > "$dir/extraParams.hxml"
68+
# extraParams also loads the collector configuration macro, even when
69+
# incremental mode is off. Keep that dependency in the test package.
70+
mkdir -p "$dir/hxcpp"
71+
cp "$ROOT/hxcpp/IncrementalGcConfig.hx" "$dir/hxcpp/"
6872
else
6973
printf '{ "name": "%s", "version": "%s", "license": "BSD", "url": "https://example.org", "description": "stand-in", "releasenote": "", "contributors": ["nobody"], "dependencies": {} }\n' "$name" "$version" > "$dir/haxelib.json"
7074
fi
7175
"$PYTHON" - "$dir" "$dir.zip" <<'PY'
7276
import os, sys, zipfile
7377
src, out = sys.argv[1], sys.argv[2]
7478
with zipfile.ZipFile(out, "w") as z:
75-
for f in os.listdir(src):
76-
z.write(os.path.join(src, f), f)
79+
for directory, _, files in os.walk(src):
80+
for name in files:
81+
path = os.path.join(directory, name)
82+
z.write(path, os.path.relpath(path, src))
7783
PY
7884
echo "$dir.zip"
7985
}

0 commit comments

Comments
 (0)