From 97e9b5e6f18705666b9d622b9eab0b31836321ba Mon Sep 17 00:00:00 2001 From: Claude Date: Mon, 21 Sep 2026 19:21:32 +0000 Subject: publish-apk: fix a SIGPIPE this repo's own README warns about The zip check used `unzip -l | grep -q`. Under pipefail, grep exits on its first match and SIGPIPEs unzip, so the pipeline fails on a perfectly valid file. It rejected a real 112MB APK as 'not an APK'. That exact trap is in the README's table, written after it broke crash detection in android-launch-check. Knowing about a trap is not the same as not falling into it, which is the argument for these scripts existing at all. Captures the listing first and tests it with `case`, and the new test builds a 300-entry zip so grep matches long before the listing ends -- which is when SIGPIPE actually bites. A single-entry fixture would have passed either way. Co-Authored-By: Claude Opus 5 Claude-Session: https://claude.ai/code/session_018AwnALZL6bD4VBtATDVv3B --- test/run-tests.sh | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'test/run-tests.sh') diff --git a/test/run-tests.sh b/test/run-tests.sh index a88e024..415ecc3 100755 --- a/test/run-tests.sh +++ b/test/run-tests.sh @@ -276,5 +276,21 @@ else bad "apk validation" "rc=$rc out=$out" fi +# 23. A real, large APK must be accepted. The first version of the zip check used +# `unzip -l | grep -q`, which under pipefail SIGPIPEs unzip and rejects valid files -- +# the very trap this repo's README documents. +realapk="$tmproot/real.apk" +mkdir -p "$tmproot/apkbuild/res" +printf 'manifest' > "$tmproot/apkbuild/AndroidManifest.xml" +# Enough entries that grep matches well before the listing ends, which is when SIGPIPE bites. +for i in $(seq 1 300); do printf 'x%.0s' $(seq 1 100) > "$tmproot/apkbuild/res/f$i.bin"; done +( cd "$tmproot/apkbuild" && zip -q -r "$realapk" . ) +out=$("$BIN/publish-apk" "$realapk" thing.apk --host "$(hostname)" --dir "$tmproot/nonexistent" 2>&1); rc=$? +if printf '%s' "$out" | grep -qi "not an APK\|not a zip"; then + bad "valid APK rejected" "out=$out" +else + ok "accepts a real multi-entry APK (no SIGPIPE from the zip check)" +fi + printf '\n=== summary: %d passed, %d failed ===\n' "$pass" "$fail" [ "$fail" -eq 0 ] -- cgit v1.2.3