From 9f54993646ca984173996b066dab1f2e823a2251 Mon Sep 17 00:00:00 2001 From: Yuki Okushi Date: Sat, 19 Nov 2022 15:16:44 +0900 Subject: [PATCH] ci: Read test output from stderr Signed-off-by: Yuki Okushi --- ci/runtest-android.rs | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/ci/runtest-android.rs b/ci/runtest-android.rs index e14dba322cdf6..0669a2055d5c0 100644 --- a/ci/runtest-android.rs +++ b/ci/runtest-android.rs @@ -22,7 +22,7 @@ fn main() { .arg(&test) .arg(&dst) .status() - .expect("failed to run: adb pushr"); + .expect("failed to run: adb push"); assert!(status.success()); let output = Command::new("adb") @@ -33,16 +33,17 @@ fn main() { .expect("failed to run: adb shell"); assert!(status.success()); + let stdout = String::from_utf8_lossy(&output.stdout); + let stderr = String::from_utf8_lossy(&output.stderr); + println!("status: {}\nstdout ---\n{}\nstderr ---\n{}", output.status, - String::from_utf8_lossy(&output.stdout), - String::from_utf8_lossy(&output.stderr)); + stdout, + stderr); - let stdout = String::from_utf8_lossy(&output.stdout); - stdout.lines().find(|l| - (l.starts_with("PASSED ") && l.contains(" tests")) || - l.starts_with("test result: ok") - ).unwrap_or_else(|| { + if !stderr.lines().any(|l| l.starts_with("PASSED ") && l.contains(" tests")) + && !stdout.lines().any(|l| l.starts_with("test result: ok")) + { panic!("failed to find successful test run"); - }); + }; }