}
}
-diff --git a/src/test/codegen/remap_path_prefix/issue-73167-remap-std.rs b/src/test/codegen/remap_path_prefix/issue-73167-remap-std.rs
+diff --git a/tests/codegen/remap_path_prefix/issue-73167-remap-std.rs b/tests/codegen/remap_path_prefix/issue-73167-remap-std.rs
index b66abc6..f6efe1e 100644
---- a/src/test/codegen/remap_path_prefix/issue-73167-remap-std.rs
-+++ b/src/test/codegen/remap_path_prefix/issue-73167-remap-std.rs
+--- a/tests/codegen/remap_path_prefix/issue-73167-remap-std.rs
++++ b/tests/codegen/remap_path_prefix/issue-73167-remap-std.rs
@@ -7,7 +7,7 @@
// true automatically. If paths to std library hasn't been remapped, we use the
// above simulate-remapped-rust-src-base option to do it temporarily
target_features = []
if self.get_toml("crt-static", build_section) == "true":
target_features += ["+crt-static"]
---- a/src/test/assembly/asm/mips-types.rs
-+++ b/src/test/assembly/asm/mips-types.rs
+--- a/tests/assembly/asm/mips-types.rs
++++ b/tests/assembly/asm/mips-types.rs
@@ -1,3 +1,4 @@
+// ignore-test
// revisions: mips32 mips64
-}
-
* {
- -webkit-box-sizing: border-box;
- -moz-box-sizing: border-box;
+ box-sizing: border-box;
+ }
--- a/src/librustdoc/html/static_files.rs
+++ b/src/librustdoc/html/static_files.rs
@@ -126,8 +126,6 @@
src/test/ui/issues/issue-44056.rs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
-diff --git a/src/test/ui/issues/issue-44056.rs b/src/test/ui/issues/issue-44056.rs
+diff --git a/tests/ui/issues/issue-44056.rs b/tests/ui/issues/issue-44056.rs
index a4903ed..ebe8402 100644
---- a/src/test/ui/issues/issue-44056.rs
-+++ b/src/test/ui/issues/issue-44056.rs
+--- a/tests/ui/issues/issue-44056.rs
++++ b/tests/ui/issues/issue-44056.rs
@@ -1,5 +1,5 @@
// build-pass (FIXME(55996): should be run on targets supporting avx)
-// only-x86_64
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- a/src/bootstrap/config.rs
+++ b/src/bootstrap/config.rs
-@@ -907,9 +907,9 @@
-
- config.stage0_metadata = t!(serde_json::from_slice::<Stage0Metadata>(&stage0_json));
+@@ -823,9 +823,9 @@
+ }
+ pub fn parse(args: &[String]) -> Config {
- #[cfg(test)]
+ /*#[cfg(test)]
- let get_toml = |_| TomlConfig::default();
+ let get_toml = |_: &_| TomlConfig::default();
- #[cfg(not(test))]
+ #[cfg(not(test))]*/
let get_toml = |file: &Path| {
let contents =
t!(fs::read_to_string(file), format!("config file {} not found", file.display()));
-@@ -907,7 +907,22 @@
+@@ -834,7 +834,23 @@
match toml::from_str(&contents)
.and_then(|table: toml::Value| TomlConfig::deserialize(table))
{
- Ok(table) => table,
-+ /// Debian: We use previous version as a custom rustc, which unfortunately won't be
-+ /// picked up because config.toml isn't read when cfg!(test). Making tests use the
-+ /// entirety of our config.toml isn't feasible either as it panicks on GitRepo::Llvm
-+ /// (d-bootstrap-custom-debuginfo-path.patch), so only give paths of initial rustc
-+ /// and cargo.
++ // Debian: We use previous version as a custom rustc, which
++ // unfortunately won't be picked up because config.toml isn't
++ // read when cfg!(test). Making tests use the entirety of our
++ // config.toml isn't feasible either as it panicks on
++ // GitRepo::Llvm (d-bootstrap-custom-debuginfo-path.patch), so
++ // only give paths of initial rustc and cargo.
+ Ok(table) => if !cfg!(test) || table.build.is_none() {
+ table
+ } else {
src/test/ui/consts/const-eval/ub-wide-ptr.rs | 1 +
6 files changed, 6 insertions(+)
---- a/src/test/ui/consts/const-eval/ub-enum.rs
-+++ b/src/test/ui/consts/const-eval/ub-enum.rs
+--- a/tests/ui/consts/const-eval/ub-enum.rs
++++ b/tests/ui/consts/const-eval/ub-enum.rs
@@ -1,3 +1,4 @@
+// ignore-test
// stderr-per-bitwidth
- #![feature(never_type)]
- #![allow(invalid_value)]
---- a/src/test/ui/consts/const-eval/ub-int-array.rs
-+++ b/src/test/ui/consts/const-eval/ub-int-array.rs
+ // Strip out raw byte dumps to make comparison platform-independent:
+ // normalize-stderr-test "(the raw bytes of the constant) \(size: [0-9]*, align: [0-9]*\)" -> "$1 (size: $$SIZE, align: $$ALIGN)"
+--- a/tests/ui/consts/const-eval/ub-int-array.rs
++++ b/tests/ui/consts/const-eval/ub-int-array.rs
@@ -1,3 +1,4 @@
+// ignore-test
// stderr-per-bitwidth
//! Test the "array of int" fast path in validity checking, and in particular whether it
//! points at the right array element.
---- a/src/test/ui/consts/const-eval/ub-nonnull.rs
-+++ b/src/test/ui/consts/const-eval/ub-nonnull.rs
+--- a/tests/ui/consts/const-eval/ub-nonnull.rs
++++ b/tests/ui/consts/const-eval/ub-nonnull.rs
@@ -1,3 +1,4 @@
+// ignore-test
- // stderr-per-bitwidth
- #![feature(rustc_attrs, ptr_metadata)]
- #![allow(invalid_value)] // make sure we cannot allow away the errors tested here
---- a/src/test/ui/consts/const-eval/ub-ref-ptr.rs
-+++ b/src/test/ui/consts/const-eval/ub-ref-ptr.rs
+ // Strip out raw byte dumps to make comparison platform-independent:
+ // normalize-stderr-test "(the raw bytes of the constant) \(size: [0-9]*, align: [0-9]*\)" -> "$1 (size: $$SIZE, align: $$ALIGN)"
+ // normalize-stderr-test "([0-9a-f][0-9a-f] |╾─*a(lloc)?[0-9]+(\+[a-z0-9]+)?─*╼ )+ *│.*" -> "HEX_DUMP"
+--- a/tests/ui/consts/const-eval/ub-ref-ptr.rs
++++ b/tests/ui/consts/const-eval/ub-ref-ptr.rs
@@ -1,3 +1,4 @@
+// ignore-test
// ignore-tidy-linelength
- // stderr-per-bitwidth
- #![allow(invalid_value)]
---- a/src/test/ui/consts/const-eval/ub-uninhabit.rs
-+++ b/src/test/ui/consts/const-eval/ub-uninhabit.rs
+ // Strip out raw byte dumps to make comparison platform-independent:
+ // normalize-stderr-test "(the raw bytes of the constant) \(size: [0-9]*, align: [0-9]*\)" -> "$1 (size: $$SIZE, align: $$ALIGN)"
+--- a/tests/ui/consts/const-eval/ub-uninhabit.rs
++++ b/tests/ui/consts/const-eval/ub-uninhabit.rs
@@ -1,3 +1,4 @@
+// ignore-test
- // stderr-per-bitwidth
-
- use std::mem;
---- a/src/test/ui/consts/const-eval/ub-wide-ptr.rs
-+++ b/src/test/ui/consts/const-eval/ub-wide-ptr.rs
+ // Strip out raw byte dumps to make comparison platform-independent:
+ // normalize-stderr-test "(the raw bytes of the constant) \(size: [0-9]*, align: [0-9]*\)" -> "$1 (size: $$SIZE, align: $$ALIGN)"
+ // normalize-stderr-test "([0-9a-f][0-9a-f] |╾─*a(lloc)?[0-9]+(\+[a-z0-9]+)?─*╼ )+ *│.*" -> "HEX_DUMP"
+--- a/tests/ui/consts/const-eval/ub-wide-ptr.rs
++++ b/tests/ui/consts/const-eval/ub-wide-ptr.rs
@@ -1,3 +1,4 @@
+// ignore-test
- // stderr-per-bitwidth
// ignore-tidy-linelength
#![allow(unused)]
+
src/test/run-make-fulldeps/reproducible-build-2/Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
-diff --git a/src/test/run-make-fulldeps/reproducible-build-2/Makefile b/src/test/run-make-fulldeps/reproducible-build-2/Makefile
+diff --git a/tests/run-make-fulldeps/reproducible-build-2/Makefile b/tests/run-make-fulldeps/reproducible-build-2/Makefile
index fd94516..957e1f4 100644
---- a/src/test/run-make-fulldeps/reproducible-build-2/Makefile
-+++ b/src/test/run-make-fulldeps/reproducible-build-2/Makefile
+--- a/tests/run-make-fulldeps/reproducible-build-2/Makefile
++++ b/tests/run-make-fulldeps/reproducible-build-2/Makefile
@@ -14,7 +14,7 @@ fat_lto:
$(RUSTC) reproducible-build.rs -C lto=fat
cp $(TMPDIR)/reproducible-build $(TMPDIR)/reproducible-build-a
src/test/run-make-fulldeps/sysroot-crates-are-unstable/Makefile | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
-diff --git a/src/test/run-make-fulldeps/sysroot-crates-are-unstable/Makefile b/src/test/run-make-fulldeps/sysroot-crates-are-unstable/Makefile
+diff --git a/tests/run-make-fulldeps/sysroot-crates-are-unstable/Makefile b/tests/run-make-fulldeps/sysroot-crates-are-unstable/Makefile
index 1e267fb..ac46c24 100644
---- a/src/test/run-make-fulldeps/sysroot-crates-are-unstable/Makefile
-+++ b/src/test/run-make-fulldeps/sysroot-crates-are-unstable/Makefile
+--- a/tests/run-make-fulldeps/sysroot-crates-are-unstable/Makefile
++++ b/tests/run-make-fulldeps/sysroot-crates-are-unstable/Makefile
@@ -1,2 +1,6 @@
+include ../tools.mk
+
compiler/rustc_llvm/build.rs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
-diff --git a/compiler/rustc_llvm/build.rs b/compiler/rustc_llvm/build.rs
-index b8f67ee..e9b1d0a 100644
--- a/compiler/rustc_llvm/build.rs
+++ b/compiler/rustc_llvm/build.rs
@@ -304,7 +304,7 @@
+ if stripped.contains(&host) { println!("cargo:rustc-link-search=native={}", stripped.replace(&host, &target)); }
}
} else if let Some(stripped) = lib.strip_prefix("-LIBPATH:") {
- println!("cargo:rustc-link-search=native={}", stripped);
+ println!("cargo:rustc-link-search=native={stripped}");
projects / rustc.git / commitdiff