diff options
| author | bjorn3 <bjorn3@users.noreply.github.com> | 2022-03-17 20:59:39 +0100 |
|---|---|---|
| committer | bjorn3 <bjorn3@users.noreply.github.com> | 2022-03-17 20:59:39 +0100 |
| commit | ce577f7f121f22e01c390d34de23a9a0536964e5 (patch) | |
| tree | 602c55e5bd27cbb73c0dd40366257f563989641a /scripts | |
| parent | 9a8da8c64a12bc564a938f3d2e0bd92f6f3f4b00 (diff) | |
| download | rust-ce577f7f121f22e01c390d34de23a9a0536964e5.tar.gz rust-ce577f7f121f22e01c390d34de23a9a0536964e5.zip | |
Fix and re-enable some rustc tests
* Set `config.opts.trimmed_def_paths` to `GoodPath` to trim def paths in error messages as expected by the rustc test suite * Fix `$SRC_DIR` normalization for out of tree compiled standard library
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/setup_rust_fork.sh | 19 | ||||
| -rwxr-xr-x | scripts/test_rustc_tests.sh | 8 |
2 files changed, 19 insertions, 8 deletions
diff --git a/scripts/setup_rust_fork.sh b/scripts/setup_rust_fork.sh index 18eb3fb5692..ddcf05ec252 100644 --- a/scripts/setup_rust_fork.sh +++ b/scripts/setup_rust_fork.sh @@ -53,9 +53,28 @@ index 887d27fd6dca4..2c2239f2b83d1 100644 let rustc_has_profiler_support = env::var_os("RUSTC_PROFILER_SUPPORT").is_some(); +diff --git a/src/tools/compiletest/src/runtest.rs b/src/tools/compiletest/src/runtest.rs +index 8431aa7b818..a3ff7e68ce5 100644 +--- a/src/tools/compiletest/src/runtest.rs ++++ b/src/tools/compiletest/src/runtest.rs +@@ -3489,11 +3489,7 @@ fn normalize_output(&self, output: &str, custom_rules: &[(String, String)]) -> S + .join("library"); + normalize_path(&src_dir, "$(echo '$SRC_DIR')"); + +- if let Some(virtual_rust_source_base_dir) = +- option_env!("CFG_VIRTUAL_RUST_SOURCE_BASE_DIR").map(PathBuf::from) +- { +- normalize_path(&virtual_rust_source_base_dir.join("library"), "$(echo '$SRC_DIR')"); +- } ++ normalize_path(&Path::new("$(cd ../build_sysroot/sysroot_src/library; pwd)"), "$(echo '$SRC_DIR')"); + + // Paths into the build directory + let test_build_dir = &self.config.build_base; EOF cat > config.toml <<EOF +changelog-seen = 2 + [llvm] ninja = false diff --git a/scripts/test_rustc_tests.sh b/scripts/test_rustc_tests.sh index f2e1bb69c14..c9f21d8f9cb 100755 --- a/scripts/test_rustc_tests.sh +++ b/scripts/test_rustc_tests.sh @@ -72,15 +72,7 @@ rm -r src/test/run-make/emit-named-files # requires full --emit support rm -r src/test/run-pass-valgrind/unsized-locals -rm src/test/ui/json-bom-plus-crlf-multifile.rs # differing warning -rm src/test/ui/json-bom-plus-crlf.rs # same rm src/test/ui/intrinsics/const-eval-select-x86_64.rs # same -rm src/test/ui/match/issue-82392.rs # differing error -rm src/test/ui/consts/min_const_fn/address_of_const.rs # same -rm src/test/ui/consts/issue-miri-1910.rs # same -rm src/test/ui/generic-associated-types/bugs/issue-80626.rs # same -rm src/test/ui/generic-associated-types/bugs/issue-89008.rs # same -rm src/test/ui/chalkify/bugs/async.rs # same rm src/test/ui/type-alias-impl-trait/cross_crate_ice*.rs # requires removed aux dep rm src/test/ui/allocator/no_std-alloc-error-handler-default.rs # missing rust_oom definition |