X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=test.sh;h=a10924628bb0eba9350b56f5603ead5b068b75f4;hb=8a6ff90a3a41e6ace18aeb089ea0a0eb3726dd08;hp=f32ec10268e6bd9beef1aebc18ca6d58658b9b66;hpb=75db7cc49de7342420dce56528136319bc02bad0;p=rust.git

diff --git a/test.sh b/test.sh
index f32ec10268e..a10924628bb 100755
--- a/test.sh
+++ b/test.sh
@@ -1,102 +1,13 @@
-#!/bin/bash
-
+#!/usr/bin/env bash
 set -e
 
-if [[ "$1" == "--release" ]]; then
-    export CHANNEL='release'
-    cargo build --release
-else
-    export CHANNEL='debug'
-    cargo build
-fi
-
-source config.sh
-
-jit() {
-    if [[ `uname` == 'Darwin' ]]; then
-        # FIXME(#671) `dlsym` returns "symbol not found" for existing symbols on macOS.
-        echo "[JIT] $1 (Ignored on macOS)"
-    else
-        echo "[JIT] $1"
-        SHOULD_RUN=1 $RUSTC --crate-type bin -Cprefer-dynamic $2
-    fi
-}
+./y.rs build --sysroot none "$@"
 
 rm -r target/out || true
-mkdir -p target/out/clif
-
-echo "[BUILD] mini_core"
-$RUSTC example/mini_core.rs --crate-name mini_core --crate-type lib,dylib
-
-echo "[BUILD] example"
-$RUSTC example/example.rs --crate-type lib
-
-JIT_ARGS="abc bcd" jit mini_core_hello_world example/mini_core_hello_world.rs
-
-echo "[AOT] mini_core_hello_world"
-$RUSTC example/mini_core_hello_world.rs --crate-name mini_core_hello_world --crate-type bin
-./target/out/mini_core_hello_world abc bcd
-
-echo "[AOT] arbitrary_self_types_pointers_and_wrappers"
-$RUSTC example/arbitrary_self_types_pointers_and_wrappers.rs --crate-name arbitrary_self_types_pointers_and_wrappers --crate-type bin
-./target/out/arbitrary_self_types_pointers_and_wrappers
-
-echo "[BUILD] sysroot"
-time ./build_sysroot/build_sysroot.sh
-
-echo "[AOT] alloc_example"
-$RUSTC example/alloc_example.rs --crate-type bin
-./target/out/alloc_example
-
-jit std_example example/std_example.rs
-
-echo "[AOT] dst_field_align"
-$RUSTC example/dst-field-align.rs -Zmir-opt-level=2 --crate-name dst_field_align --crate-type bin
-./target/out/dst_field_align
-
-echo "[AOT] std_example"
-$RUSTC example/std_example.rs --crate-type bin
-./target/out/std_example
-
-echo "[BUILD] mod_bench"
-$RUSTC example/mod_bench.rs --crate-type bin
-
-# FIXME linker gives multiple definitions error on Linux
-#echo "[BUILD] sysroot in release mode"
-#./build_sysroot/build_sysroot.sh --release
-
-pushd simple-raytracer
-echo "[BENCH] ebobby/simple-raytracer"
-cargo clean && ../cargo.sh build
-cp ./target/*/debug/main ./raytracer_cg_clif
-
-hyperfine --runs ${RUN_RUNS:-10} ./raytracer_cg_llvm ./raytracer_cg_clif
-popd
-
-pushd regex
-echo "[TEST] rust-lang/regex example shootout-regex-dna"
-../cargo.sh clean
-# Make sure `[codegen mono items] start` doesn't poison the diff
-../cargo.sh build --example shootout-regex-dna
-cat examples/regexdna-input.txt | ../cargo.sh run --example shootout-regex-dna > res.txt
-diff -u res.txt examples/regexdna-output.txt
-
-echo "[TEST] rust-lang/regex tests"
-../cargo.sh test --tests -- --exclude-should-panic --test-threads 1 -Zunstable-options
-popd
-
-echo
-echo "[BENCH COMPILE] mod_bench"
 
-COMPILE_MOD_BENCH_INLINE="$RUSTC 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"
-COMPILE_MOD_BENCH_LLVM_3="rustc example/mod_bench.rs --crate-type bin -Copt-level=3 -o target/out/mod_bench_llvm_3 -Cpanic=abort"
+scripts/tests.sh no_sysroot
 
-# Use 100 runs, because a single compilations doesn't take more than ~150ms, so it isn't very slow
-hyperfine --runs ${COMPILE_RUNS:-100} "$COMPILE_MOD_BENCH_INLINE" "$COMPILE_MOD_BENCH_LLVM_0" "$COMPILE_MOD_BENCH_LLVM_1" "$COMPILE_MOD_BENCH_LLVM_2" "$COMPILE_MOD_BENCH_LLVM_3"
+./y.rs build "$@"
 
-echo
-echo "[BENCH RUN] mod_bench"
-hyperfine --runs ${RUN_RUNS:-10} ./target/out/mod_bench{,_inline} ./target/out/mod_bench_llvm_*
+scripts/tests.sh base_sysroot
+scripts/tests.sh extended_sysroot