Enable multithread testing using qemu-system and change booting message

cross-rs · Nov 22, 2017 · 6ede842 · 6ede842
1 parent 5be02f8
commit 6ede842
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/docker/linux-runner b/docker/linux-runner
@@ -22,6 +22,8 @@ case "$CROSS_RUNNER" in
     ;;
 esac
 
+export -n RUST_TEST_THREADS
+
 if [ "$arch" = "arm" ]; then
   opt="-machine virt"
 fi
@@ -33,11 +35,11 @@ fi
 (
   flock -n 200 || exit 0
 
-  echo Starting qemu...
+  echo Booting QEMU virtual machine with $(nproc) cpus...
 
   qemu-system-$arch \
     -m 1024 \
-    -smp 4 \
+    -smp $(nproc) \
     -nographic \
     $opt \
     -kernel /qemu/vmlinuz \
@@ -53,7 +55,7 @@ fi
   nc 127.0.0.1 4444 | while read LINE; do
     LINE=$(echo "$LINE" | tr -d '\r')
     if [[ "$LINE" == "emulator is ready!"* ]]; then
-      echo "Boot in ${LINE##* } seconds"
+      echo "Booted in ${LINE##* } seconds"
       break
     fi
   done