Parcourir la source

no need to explicitly call qemu-$ARCH

Jorge Aparicio il y a 8 ans
Parent
commit
a2135c1a5c
2 fichiers modifiés avec 1 ajouts et 14 suppressions
  1. 0 4
      ci/env.sh
  2. 1 10
      ci/script.sh

+ 0 - 4
ci/env.sh

@@ -30,12 +30,10 @@ case $TARGET in
         ;;
     mips-unknown-linux-gnu)
         export PREFIX=mips-linux-gnu-
-        # export QEMU=qemu-mips
         export QEMU_LD_PREFIX=/usr/mips-linux-gnu
         ;;
     mipsel-unknown-linux-gnu)
         export PREFIX=mipsel-linux-gnu-
-        # export QEMU=qemu-mipsel
         export QEMU_LD_PREFIX=/usr/mipsel-linux-gnu
         ;;
     powerpc-unknown-linux-gnu)
@@ -44,12 +42,10 @@ case $TARGET in
         ;;
     powerpc64-unknown-linux-gnu)
         export PREFIX=powerpc64-linux-gnu-
-        # export QEMU=qemu-ppc64
         export QEMU_LD_PREFIX=/usr/powerpc64-linux-gnu
         ;;
     powerpc64le-unknown-linux-gnu)
         export PREFIX=powerpc64le-linux-gnu-
-        # export QEMU=qemu-ppc64le
         export QEMU_LD_PREFIX=/usr/powerpc64le-linux-gnu
         # Issue #2. QEMU doesn't work
         export RUN_TESTS=n

+ 1 - 10
ci/script.sh

@@ -20,16 +20,7 @@ run_tests() {
         export RUST_TEST_THREADS=1
     fi
 
-    if [[ $QEMU ]]; then
-        cargo test --target $TARGET --no-run
-        if [[ ${RUN_TESTS:-y} == "y" ]]; then
-           $QEMU target/**/debug/rustc_builtins-*
-        fi
-        cargo test --target $TARGET --release --no-run
-        if [[ ${RUN_TESTS:-y} == "y" ]]; then
-            $QEMU target/**/release/rustc_builtins-*
-        fi
-    elif [[ ${RUN_TESTS:-y} == "y" ]]; then
+    if [[ ${RUN_TESTS:-y} == "y" ]]; then
         cargo test --target $TARGET
         cargo test --target $TARGET --release
     fi