Skip to content

Commit aa31d42

Browse files
committed
Remove no longer necessary disabling of dylib usage for run-make tests
Run-make tests are now fully compiled using the bootstrap compiler.
1 parent 75109ec commit aa31d42

File tree

1 file changed

+0
-14
lines changed

1 file changed

+0
-14
lines changed

scripts/test_rustc_tests.sh

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -150,22 +150,8 @@ rm tests/ui/intrinsics/panic-uninitialized-zeroed.rs # same
150150
rm tests/ui/process/process-panic-after-fork.rs # same
151151

152152
cp ../dist/bin/rustdoc-clif ../dist/bin/rustdoc # some tests expect bin/rustdoc to exist
153-
cp $(../dist/rustc-clif --print target-libdir)/libstd-*.so ../dist/lib/
154153

155154
cat <<EOF | git apply -
156-
diff --git a/src/tools/compiletest/src/runtest/run_make.rs b/src/tools/compiletest/src/runtest/run_make.rs
157-
index e7ae773ffa1d3..04bc2d7787da7 100644
158-
--- a/src/tools/compiletest/src/runtest/run_make.rs
159-
+++ b/src/tools/compiletest/src/runtest/run_make.rs
160-
@@ -117,7 +117,6 @@ impl TestCx<'_> {
161-
.arg(format!("run_make_support={}", &support_lib_path.to_string_lossy()))
162-
.arg("--edition=2021")
163-
- .arg(&self.testpaths.file.join("rmake.rs"))
164-
- .arg("-Cprefer-dynamic");
165-
+ .arg(&self.testpaths.file.join("rmake.rs"));
166-
167-
// In test code we want to be very pedantic about values being silently discarded that are
168-
// annotated with \`#[must_use]\`.
169155
diff --git a/tests/run-make/linker-warning/rmake.rs b/tests/run-make/linker-warning/rmake.rs
170156
index 30387af428c..f7895b12961 100644
171157
--- a/tests/run-make/linker-warning/rmake.rs

0 commit comments

Comments
 (0)