Rustup to rustc 1.34.0-nightly (b244f61b7 2019-02-12)

[rust.git] / test.sh

diff --git a/test.sh b/test.sh
index 6c742298cf82d614a207156659f5efbdb4b12e21..8cc5b2d186ecc2e801d716b066fd0ce594ca52d6 100755 (executable)
--- a/test.sh
+++ b/test.sh
@@ -1,11 +1,6 @@
 #!/bin/bash
 source config.sh
 
-build_example_bin() {
-    $RUSTC $2 --crate-name $1 --crate-type bin
-    sh -c ./target/out/$1 || true
-}
-
 rm -r target/out || true
 mkdir -p target/out/clif
 
@@ -19,23 +14,28 @@ echo "[JIT] mini_core_hello_world"
 SHOULD_RUN=1 $RUSTC --crate-type bin example/mini_core_hello_world.rs --cfg jit
 
 echo "[AOT] mini_core_hello_world"
-build_example_bin mini_core_hello_world example/mini_core_hello_world.rs
+$RUSTC example/mini_core_hello_world.rs --crate-name mini_core_hello_world --crate-type bin
+sh -c ./target/out/mini_core_hello_world
 
 echo "[BUILD] sysroot"
 time ./build_sysroot/build_sysroot.sh
 
-# TODO linux linker doesn't accept duplicate definitions
-# echo "[BUILD+RUN] alloc_example"
-#$RUSTC --sysroot ./build_sysroot/sysroot example/alloc_example.rs --crate-type bin
-#./target/out/alloc_example
+echo "[BUILD+RUN] alloc_example"
+$RUSTC --sysroot ./build_sysroot/sysroot example/alloc_example.rs --crate-type bin
+./target/out/alloc_example
+
+echo "[BUILD+RUN] std_example"
+$RUSTC --sysroot ./build_sysroot/sysroot example/std_example.rs --crate-type bin
+./target/out/std_example
 
 echo "[BUILD] mod_bench"
 $RUSTC --sysroot ./build_sysroot/sysroot example/mod_bench.rs --crate-type bin
 
-echo "[BUILD] sysroot in release mode"
-./build_sysroot/build_sysroot.sh --release
+# FIXME linker gives multiple definitions error on Linux
+#echo "[BUILD] sysroot in release mode"
+#./build_sysroot/build_sysroot.sh --release
 
-COMPILE_MOD_BENCH_INLINE="$RUSTC --sysroot ./build_sysroot/sysroot example/mod_bench.rs --crate-type bin -Zmir-opt-level=3 -Og --crate-name mod_bench_inline"
+COMPILE_MOD_BENCH_INLINE="$RUSTC --sysroot ./build_sysroot/sysroot example/mod_bench.rs --crate-type bin -Zmir-opt-level=3 -O --crate-name mod_bench_inline"
 COMPILE_MOD_BENCH_LLVM_0="rustc example/mod_bench.rs --crate-type bin -Copt-level=0 -o target/out/mod_bench_llvm_0 -Cpanic=abort"
 COMPILE_MOD_BENCH_LLVM_1="rustc example/mod_bench.rs --crate-type bin -Copt-level=1 -o target/out/mod_bench_llvm_1 -Cpanic=abort"
 COMPILE_MOD_BENCH_LLVM_2="rustc example/mod_bench.rs --crate-type bin -Copt-level=2 -o target/out/mod_bench_llvm_2 -Cpanic=abort"