Use gradle stdout for CN1 screenshots

Author: shai-almog

scripts/android/tests/HelloCodenameOneInstrumentedTest.java

@@ -45,7 +45,6 @@ public class HelloCodenameOneInstrumentedTest {
 
     private static void println(String s) {
         System.out.println(s);
-        android.util.Log.i("CN1SS", s);
     }
 
     private static void settle(long millis) {
@@ -252,13 +251,11 @@ private static void emitScreenshotChannel(byte[] bytes, String testName, String
                             + ":"
                             + chunk;
             System.out.println(line);
-            android.util.Log.i("CN1SS", line);
             count++;
         }
         println("CN1SS:INFO:test=" + safeName + " chunks=" + count + " total_b64_len=" + b64.length());
         String endLine = prefix + ":END:" + safeName;
         System.out.println(endLine);
-        android.util.Log.i("CN1SS", endLine);
         System.out.flush();
     }
 

scripts/run-android-instrumentation-tests.sh

@@ -64,6 +64,7 @@ ENV_FILE="$ENV_DIR/env.sh"
 ARTIFACTS_DIR="${ARTIFACTS_DIR:-${GITHUB_WORKSPACE:-$REPO_ROOT}/artifacts}"
 ensure_dir "$ARTIFACTS_DIR"
 TEST_LOG="$ARTIFACTS_DIR/connectedAndroidTest.log"
+GRADLE_STDOUT_LOG="$ARTIFACTS_DIR/connectedAndroidTest.stdout"
 SCREENSHOT_REF_DIR="$SCRIPT_DIR/android/screenshots"
 SCREENSHOT_TMP_DIR="$(mktemp -d "${TMPDIR}/cn1ss-XXXXXX" 2>/dev/null || echo "${TMPDIR}/cn1ss-tmp")"
 ensure_dir "$SCREENSHOT_TMP_DIR"
@@ -144,44 +145,82 @@ fi
 ra_log "Running connected Android instrumentation tests"
 ORIGINAL_JAVA_HOME="${JAVA_HOME:-}"
 export JAVA_HOME="$JAVA17_HOME"
-GRADLE_RC=0
-if ! (
-  cd "$GRADLE_PROJECT_DIR" &&
-  {
-    if command -v sdkmanager >/dev/null 2>&1; then
-      yes | sdkmanager --licenses >/dev/null 2>&1 || true
-    elif [ -x "$ANDROID_SDK_ROOT/cmdline-tools/latest/bin/sdkmanager" ]; then
-      yes | "$ANDROID_SDK_ROOT/cmdline-tools/latest/bin/sdkmanager" --licenses >/dev/null 2>&1 || true
-    fi
-    ./gradlew --no-daemon connectedDebugAndroidTest
-  }
-); then
-  GRADLE_RC=$?
-fi
+: > "$GRADLE_STDOUT_LOG"
+set +e
+(
+  cd "$GRADLE_PROJECT_DIR" || exit 1
+  if command -v sdkmanager >/dev/null 2>&1; then
+    yes | sdkmanager --licenses >/dev/null 2>&1 || true
+  elif [ -x "$ANDROID_SDK_ROOT/cmdline-tools/latest/bin/sdkmanager" ]; then
+    yes | "$ANDROID_SDK_ROOT/cmdline-tools/latest/bin/sdkmanager" --licenses >/dev/null 2>&1 || true
+  fi
+  ./gradlew --no-daemon connectedDebugAndroidTest
+) | tee "$GRADLE_STDOUT_LOG"
+GRADLE_RC=${PIPESTATUS[0]}
+set -e
 export JAVA_HOME="$ORIGINAL_JAVA_HOME"
+ra_log "Gradle stdout captured at $GRADLE_STDOUT_LOG"
 
 sleep 2
 
-declare -a CN1SS_SOURCES=("LOGCAT:$TEST_LOG")
+declare -a CN1SS_SOURCES=()
+[ -s "$GRADLE_STDOUT_LOG" ] && CN1SS_SOURCES+=("STDOUT:$GRADLE_STDOUT_LOG")
+[ -s "$TEST_LOG" ] && CN1SS_SOURCES+=("LOGCAT:$TEST_LOG")
 
 
 # ---- Chunk accounting (diagnostics) ---------------------------------------
 
-LOGCAT_CHUNKS="$(cn1ss_count_chunks "$TEST_LOG")"
-LOGCAT_CHUNKS="${LOGCAT_CHUNKS//[^0-9]/}"; : "${LOGCAT_CHUNKS:=0}"
+if [ ${#CN1SS_SOURCES[@]} -eq 0 ]; then
+  ra_log "STAGE:MARKERS_NOT_FOUND -> No CN1SS sources were captured"
+  exit 12
+fi
 
-ra_log "Chunk counts -> logcat: ${LOGCAT_CHUNKS}"
+TOTAL_CHUNKS=0
+PRIMARY_SOURCE_LABEL=""
+PRIMARY_SOURCE_PATH=""
+for entry in "${CN1SS_SOURCES[@]}"; do
+  source_type="${entry%%:*}"
+  source_path="${entry#*:}"
+  count="$(cn1ss_count_chunks "$source_path" 2>/dev/null || echo 0)"
+  count="${count//[^0-9]/}"; : "${count:=0}"
+  label="$(echo "$source_type" | tr '[:upper:]' '[:lower:]')"
+  ra_log "Chunk counts -> ${label}: ${count}"
+  if [ -z "$PRIMARY_SOURCE_PATH" ] && [ "$count" -gt 0 ]; then
+    PRIMARY_SOURCE_PATH="$source_path"
+    PRIMARY_SOURCE_LABEL="$source_type"
+  fi
+  TOTAL_CHUNKS=$((TOTAL_CHUNKS + count))
+done
 
-if [ "${LOGCAT_CHUNKS:-0}" = "0" ]; then
+if [ "$TOTAL_CHUNKS" -eq 0 ]; then
   ra_log "STAGE:MARKERS_NOT_FOUND -> DeviceRunner output did not include CN1SS chunks"
-  ra_log "---- CN1SS lines from logcat ----"
-  (grep "CN1SS:" "$TEST_LOG" || true) | sed 's/^/[CN1SS] /'
+  for entry in "${CN1SS_SOURCES[@]}"; do
+    source_type="${entry%%:*}"
+    source_path="${entry#*:}"
+    if [ -s "$source_path" ]; then
+      label="$(echo "$source_type" | tr '[:upper:]' '[:lower:]')"
+      ra_log "---- CN1SS lines from ${label} ----"
+      (grep "CN1SS:" "$source_path" || true) | sed 's/^/[CN1SS] /'
+    fi
+  done
   exit 12
 fi
 
 # ---- Identify CN1SS test streams -----------------------------------------
 
-TEST_NAMES_RAW="$(cn1ss_list_tests "$TEST_LOG" 2>/dev/null | awk 'NF' | sort -u || true)"
+TEST_NAMES_RAW=""
+if [ -n "$PRIMARY_SOURCE_PATH" ]; then
+  TEST_NAMES_RAW="$(cn1ss_list_tests "$PRIMARY_SOURCE_PATH" 2>/dev/null | awk 'NF' | sort -u || true)"
+fi
+if [ -z "$TEST_NAMES_RAW" ]; then
+  for entry in "${CN1SS_SOURCES[@]}"; do
+    source_path="${entry#*:}"
+    TEST_NAMES_RAW="$(cn1ss_list_tests "$source_path" 2>/dev/null | awk 'NF' | sort -u || true)"
+    if [ -n "$TEST_NAMES_RAW" ]; then
+      break
+    fi
+  done
+fi
 declare -a TEST_NAMES=()
 if [ -n "$TEST_NAMES_RAW" ]; then
   while IFS= read -r name; do
@@ -216,16 +255,22 @@ for test in "${TEST_NAMES[@]}"; do
     ra_log "WARN: Failed to extract/decode CN1SS payload for test '$test'; continuing without screenshot"
     rm -f "$dest" 2>/dev/null || true
     RAW_B64_OUT="$SCREENSHOT_TMP_DIR/${test}.raw.b64"
-    if cn1ss_extract_base64 "$TEST_LOG" "$test" > "$RAW_B64_OUT" 2>/dev/null; then
-      if [ -s "$RAW_B64_OUT" ]; then
-        head -c 64 "$RAW_B64_OUT" | sed 's/^/[CN1SS-B64-HEAD] /'
-        ra_log "Partial base64 saved at: $RAW_B64_OUT"
+    rm -f "$RAW_B64_OUT" 2>/dev/null || true
+    for entry in "${CN1SS_SOURCES[@]}"; do
+      source_type="${entry%%:*}"
+      source_path="${entry#*:}"
+      if cn1ss_extract_base64 "$source_path" "$test" > "$RAW_B64_OUT" 2>/dev/null; then
+        if [ -s "$RAW_B64_OUT" ]; then
+          head -c 64 "$RAW_B64_OUT" | sed 's/^/[CN1SS-B64-HEAD] /'
+          ra_log "Partial base64 saved (${source_type}) at: $RAW_B64_OUT"
+        else
+          rm -f "$RAW_B64_OUT" 2>/dev/null || true
+        fi
+        break
       else
         rm -f "$RAW_B64_OUT" 2>/dev/null || true
       fi
-    else
-      rm -f "$RAW_B64_OUT" 2>/dev/null || true
-    fi
+    done
     TEST_OUTPUTS["$test"]="$dest"
     TEST_SOURCES["$test"]="missing"
     ra_log "  -> Marked '$test' as missing actual screenshot (placeholder path: $dest)"