Эх сурвалжийг харах

Keep mangled-names as a default feature

Paolo Teti 7 жил өмнө
parent
commit
7b81af044e
2 өөрчлөгдсөн 9 нэмэгдсэн , 6 устгасан
  1. 8 6
      ci/run.sh
  2. 1 0
      testcrate/Cargo.toml

+ 8 - 6
ci/run.sh

@@ -30,7 +30,8 @@ case $1 in
 
             RUSTFLAGS="-C debug-assertions=no -C lto" \
             CARGO_INCREMENTAL=0 \
-              $run --test $t --features 'no_std mem c' --no-run
+              $run --test $t --no-default-features \
+                   --features 'no_std mem c' --no-run
             qemu-arm-static target/${1}/debug/$t-*
 	done
 
@@ -38,16 +39,17 @@ case $1 in
             t=${t%.rs}
             RUSTFLAGS="-C lto" \
             CARGO_INCREMENTAL=0 \
-              $run --test $t --features 'no_std mem c' --no-run --release
+              $run --test $t --no-default-features \
+                   --features 'no_std mem c' --no-run --release
             qemu-arm-static target/${1}/release/$t-*
         done
         ;;
     *)
         run="cargo test --manifest-path testcrate/Cargo.toml --target $1"
-        $run --features mangled-names
-        $run --features mangled-names --release
-        $run --features 'mangled-names c'
-        $run --features 'mangled-names c' --release
+        $run
+        $run --release
+        $run --features c
+        $run --features c --release
         ;;
 esac
 

+ 1 - 0
testcrate/Cargo.toml

@@ -25,4 +25,5 @@ utest-macros = { git = "https://github.com/japaric/utest" }
 c = ["compiler_builtins/c"]
 mem = ["compiler_builtins/mem"]
 mangled-names = ["compiler_builtins/mangled-names"]
+default = ["mangled-names"]
 no_std = []