Fix the s390x and sparc64 targets

The problem was that test-runner-linux didn't actually check the test
program's exit status, it just looked for a string printed by the ctest
crate.  Since the cmsg test doesn't use ctest, it didn't print that
string.  The "panic: attempted to kill init" messages were red herring;
that happens even on a successful test.  The SIGILL I reported only
happened because I tried running the sparc64 tests using user-mode
emulation, which CI does not do.

Author: asomers

ci/docker/x86_64-rumprun-netbsd/runtest.rs

@@ -47,7 +47,8 @@ fn find_ok(input: &mut Read, tx: mpsc::Sender<()>) {
     for line in BufReader::new(input).lines() {
         let line = line.unwrap();
         println!("{}", line);
-        if line.starts_with("PASSED ") && line.contains(" tests") {
+        if (line.starts_with("PASSED ") && line.contains(" tests")) ||
+            line.starts_with("test result: ok "){
             tx.send(()).unwrap();
         }
     }

ci/ios/deploy_and_run_on_ios_simulator.rs

@@ -129,8 +129,11 @@ fn run_app_on_simulator() {
 
     let stdout = String::from_utf8_lossy(&output.stdout);
     let passed = stdout.lines()
-                       .find(|l| l.contains("PASSED"))
-                       .map(|l| l.contains("tests"))
+                       .find(|l|
+                             (l.contains("PASSED") &&
+                              l.contains("tests")) ||
+                             l.contains("test result: ok")
+                        )
                        .unwrap_or(false);
 
     println!("Shutting down simulator");

ci/run.sh

@@ -77,7 +77,7 @@ if [ "$QEMU" != "" ]; then
     -net user \
     -nographic \
     -vga none 2>&1 | tee "${CARGO_TARGET_DIR}/out.log"
-  exec grep "^PASSED .* tests" "${CARGO_TARGET_DIR}/out.log"
+  exec egrep "^(PASSED)|(test result: ok)" "${CARGO_TARGET_DIR}/out.log"
 fi
 
 # FIXME: x86_64-unknown-linux-gnux32 fail to compile without --release

ci/runtest-android.rs

@@ -34,8 +34,10 @@ fn main() {
              String::from_utf8_lossy(&output.stderr));
 
     let stdout = String::from_utf8_lossy(&output.stdout);
-    let mut lines = stdout.lines().filter(|l| l.starts_with("PASSED "));
-    if !lines.any(|l| l.contains(" tests")) {
+    let passed = stdout.lines().find(|l|
+        (l.starts_with("PASSED ") && l.contains(" tests")) ||
+        l.starts_with("test result: ok ")
+    ).unwrap_or_else(|| {
         panic!("failed to find successful test run");
-    }
+    });
 }

ci/test-runner-linux

@@ -6,6 +6,8 @@ arch=$1
 prog=$2
 
 cd /qemu/init
+echo "#!/bin/sh\n/prog --color=never" > run_prog.sh
+chmod +x run_prog.sh
 cp -f $2 prog
 find . | cpio --create --format='newc' --quiet | gzip > ../initrd.gz
 cd ..
@@ -15,9 +17,9 @@ timeout 30s qemu-system-$arch \
   -nographic \
   -kernel kernel \
   -initrd initrd.gz \
-  -append init=/prog > output || true
+  -append init=/run_prog.sh > output || true
 
 # remove kernel messages
 tr -d '\r' < output | egrep -v '^\['
 
-grep PASSED output > /dev/null
+egrep "(PASSED)|(test result: ok)" output > /dev/null

libc-test/build.rs

@@ -6,17 +6,9 @@ extern crate ctest;
 use std::env;
 
 fn do_cc() {
-    // Run the cmsg tests on all Unixen, but skip them on platforms that fail
-    // due to suspected QEMU bugs.  Sparc64 gets SIGILL and s390x hangs, both
-    // before executing any test functions.
-    #[cfg(all(unix,
-              not(target_arch = "sparc64"),
-              not(target_arch = "s390x")))]
-    {
-        cc::Build::new()
-            .file("src/cmsg.c")
-            .compile("cmsg");
-    }
+    cc::Build::new()
+        .file("src/cmsg.c")
+        .compile("cmsg");
 }
 
 fn do_ctest() {

libc-test/test/cmsg.rs

@@ -3,14 +3,6 @@
 
 extern crate libc;
 
-// Run these tests on all Unixen, but skip them on platforms that fail due to
-// suspected QEMU bugs.  Sparc64 gets SIGILL and s390x hangs, both before
-// executing any test functions.
-#[cfg(all(unix,
-          not(target_arch = "sparc64"),
-          not(target_arch = "s390x")))]
-mod cmsg {
-
 use libc::{c_uchar, c_uint, c_void, cmsghdr, msghdr};
 use std::{mem, ptr};
 
@@ -95,5 +87,3 @@ fn test_cmsg_space() {
         }
     }
 }
-
-}