bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Fix running rustc tests

Browse source 
There are still two failures due to incorrect test annotations
This commit is contained in:
bjorn3 2022-06-09 14:56:53 +00:00
parent a298c6908e
commit ec841f58d3
2 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
scripts/setup_rust_fork.sh
View file

@ -29,14 +29,15 @@ diff --git a/src/tools/compiletest/src/runtest.rs b/src/tools/compiletest/src/ru
index 8431aa7b818..a3ff7e68ce5 100644 index 8431aa7b818..a3ff7e68ce5 100644
--- a/src/tools/compiletest/src/runtest.rs --- a/src/tools/compiletest/src/runtest.rs
+++ b/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 @@ -3489,12 +3489,7 @@ fn normalize_output(&self, output: &str, custom_rules: &[(String, String)]) -> S
.join("library"); let compiler_src_dir = base_dir.join("compiler");
normalize_path(&src_dir, "$(echo '$SRC_DIR')"); normalize_path(&compiler_src_dir, "$(echo '$COMPILER_DIR')");
- if let Some(virtual_rust_source_base_dir) = - if let Some(virtual_rust_source_base_dir) =
- option_env!("CFG_VIRTUAL_RUST_SOURCE_BASE_DIR").map(PathBuf::from) - 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(&virtual_rust_source_base_dir.join("library"), "$(echo '$SRC_DIR')");
- normalize_path(&virtual_rust_source_base_dir.join("compiler"), "$(echo '$COMPILER_DIR')");
- } - }
+ normalize_path(&Path::new("$(cd ../build_sysroot/sysroot_src/library; pwd)"), "$(echo '$SRC_DIR')"); + normalize_path(&Path::new("$(cd ../build_sysroot/sysroot_src/library; pwd)"), "$(echo '$SRC_DIR')");

1
scripts/test_rustc_tests.sh
View file

@ -89,6 +89,7 @@ rm src/test/ui/consts/issue-33537.rs # same
rm -r src/test/run-make/emit-shared-files # requires the rustdoc executable in build/bin/ rm -r src/test/run-make/emit-shared-files # requires the rustdoc executable in build/bin/
rm -r src/test/run-make/unstable-flag-required # same rm -r src/test/run-make/unstable-flag-required # same
rm -r src/test/run-make/rustdoc-* # same rm -r src/test/run-make/rustdoc-* # same
rm -r src/test/run-make/remap-path-prefix-dwarf # requires llvm-dwarfdump
# genuine bugs # genuine bugs
# ============ # ============