swung0x48/MobileGL
1
0
Fork 0
mirror of https://github.com/MobileGL-Dev/MobileGL synced 2026-11-07 01:53:24 +09:00
Code Issues Packages Projects Releases Wiki Activity

[android-plugin] (P7): the result verdict hands native python a host path whatever the caller set MSYS_NO_PATHCONV to

Browse Source 
On Git Bash the script protects its own adb calls with MSYS_NO_PATHCONV=1, but the
two python invocations relied on the caller NOT having exported it; a session that
did (for the adb-side /data/... arguments the runbook mentions) got json.load failing
on /c/... for a result.json that existed - every case reported "trace replay failed"
over a passed result. host_path_for_adb already exists for exactly this; use it.
This commit is contained in:
swung0x48
2026-09-22 14:17:42 -04:00
parent c890f0ad1a
commit 8b02feb245
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
android-plugin/trace-replay-ci.sh
+7 -2
View File
@@ -583,9 +583,14 @@ run_retrace() {
fi
fi
"${PYTHON}" -c 'import json, sys; result = json.load(open(sys.argv[1], encoding="utf-8")); sys.exit(0 if result.get("passed") else f"trace replay failed: {result}")' "${result_dir}/result.json" || return "$?"
# The two paths below reach a NATIVE python. On Git Bash that is only right when MSYS
# converts /c/... for it, which a caller's MSYS_NO_PATHCONV=1 (set for adb's /data/...
# arguments) switches off - then json.load fails on a file that exists and every case
# reads "trace replay failed" over a passed result.json. host_path_for_adb converts
# explicitly, so the verdict no longer depends on the caller's environment.
"${PYTHON}" -c 'import json, sys; result = json.load(open(sys.argv[1], encoding="utf-8")); sys.exit(0 if result.get("passed") else f"trace replay failed: {result}")' "$(host_path_for_adb "${result_dir}/result.json")" || return "$?"
if [ "${require_inproc}" -eq 1 ]; then
"${PYTHON}" - "${result_dir}/mobilegl.log" "${result_dir}/transport-proof.json" <<'PY'
"${PYTHON}" - "$(host_path_for_adb "${result_dir}/mobilegl.log")" "$(host_path_for_adb "${result_dir}/transport-proof.json")" <<'PY'
import json
from pathlib import Path
import re