diff options
author | Yuki Okushi <jtitor@2k36.org> | 2022-11-19 15:16:44 +0900 |
---|---|---|
committer | Yuki Okushi <jtitor@2k36.org> | 2022-11-19 16:57:06 +0900 |
commit | 89d7013676dda9b0300232de3e7dd3e80e96a6ed (patch) | |
tree | addf717530fe64b8485ac54e1c30a3c1c7dffa0e /ci | |
parent | bbf929d2c8355fa19384b3551c5874c866be465f (diff) | |
download | rust-libc-89d7013676dda9b0300232de3e7dd3e80e96a6ed.tar.gz |
ci: Read test output from stderr
Signed-off-by: Yuki Okushi <jtitor@2k36.org>
Diffstat (limited to 'ci')
-rw-r--r-- | ci/runtest-android.rs | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/ci/runtest-android.rs b/ci/runtest-android.rs index e14dba322c..92bce79b0d 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")) || l.starts_with("test result: ok")) + && !stdout.lines().any(|l| (l.starts_with("PASSED ") && l.contains(" tests")) || l.starts_with("test result: ok")) + { panic!("failed to find successful test run"); - }); + }; } |