Commit 8e6efa1
committed
ghidra: derive the 7-Zip platform assertion from uname, not from my host
CI caught this on amd64, and the failure is the useful kind:
sevenzip_native: grep -q 'PLATFORM=Linux-arm64' exit code 1
stdout:
PLATFORM=Linux-amd64
ENTRY=SEVENZIP_PARITY_OK.txt
The test was wrong, not the package. I hardcoded the architecture I
happened to build on. Note what the same output proves: on amd64 the
native initialised AND decompressed the container — ENTRY is right there
— so 7z works on both arches and only the assertion was too specific.
Now derived from uname: Linux-arm64 on aarch64, Linux-amd64 on x86_64,
and an explicit failure on anything else rather than a silently skipped
assertion.
It still catches the regression it exists for. On arm64 the answer is
Linux-arm64 ONLY because build.sh swaps the all-platforms jar for the
per-platform one; if that regresses, the platform list stops being a
single entry, getPlatformBestMatch() falls back to matching os.arch
("aarch64") against "Linux-arm64", and cannot succeed — so an arm64 host
reports Linux-amd64 and the test fails. Verified that case explicitly:
uname=x86_64 want=Linux-amd64 vs CI's real output PASS
uname=aarch64 want=Linux-arm64 vs our build PASS
uname=aarch64 serving Linux-amd64 (the regression) FAIL
This is the first real feedback from the amd64 path, which I had flagged
as untested — the [ -f ] guard that takes upstream's natives on x86_64
now has evidence behind it too.
14/14 on arm64 after the change.1 parent 024fc72 commit 8e6efa1
1 file changed
Lines changed: 30 additions & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
208 | 208 | | |
209 | 209 | | |
210 | 210 | | |
211 | | - | |
| 211 | + | |
| 212 | + | |
| 213 | + | |
| 214 | + | |
| 215 | + | |
| 216 | + | |
| 217 | + | |
| 218 | + | |
| 219 | + | |
| 220 | + | |
| 221 | + | |
| 222 | + | |
| 223 | + | |
| 224 | + | |
| 225 | + | |
| 226 | + | |
| 227 | + | |
| 228 | + | |
| 229 | + | |
| 230 | + | |
| 231 | + | |
| 232 | + | |
| 233 | + | |
| 234 | + | |
| 235 | + | |
| 236 | + | |
| 237 | + | |
| 238 | + | |
| 239 | + | |
| 240 | + | |
212 | 241 | | |
213 | 242 | | |
214 | 243 | | |
| |||
0 commit comments