Skip to content

Commit 22331ad

Browse files
committed
Fix many tests
1 parent 0f40e50 commit 22331ad

File tree

1 file changed

+7
-8
lines changed

1 file changed

+7
-8
lines changed

test.sh

+7-8
Original file line numberDiff line numberDiff line change
@@ -82,15 +82,14 @@ diff --git a/src/tools/compiletest/src/runtest.rs b/src/tools/compiletest/src/ru
8282
index bac41a7c57..50acb93010 100644
8383
--- a/src/tools/compiletest/src/runtest.rs
8484
+++ b/src/tools/compiletest/src/runtest.rs
85-
@@ -1598,7 +1598,7 @@ impl<'test> TestCx<'test> {
86-
create_dir_all(aux_cx.output_base_dir()).unwrap();
87-
let mut aux_rustc = aux_cx.make_compile_args(&aux_testpaths.file, aux_output);
88-
89-
- let crate_type = if aux_props.no_prefer_dynamic {
90-
+ let crate_type = if true || aux_props.no_prefer_dynamic {
91-
None
92-
} else if self.config.target.contains("cloudabi")
85+
@@ -1604,6 +1604,7 @@ impl<'test> TestCx<'test> {
9386
|| self.config.target.contains("emscripten")
87+
|| (self.config.target.contains("musl") && !aux_props.force_host)
88+
|| self.config.target.contains("wasm32")
89+
+ || true
90+
{
91+
// We primarily compile all auxiliary libraries as dynamic libraries
92+
// to avoid code size bloat and large binaries as much as possible
9493
@@ -1822,7 +1822,7 @@ impl<'test> TestCx<'test> {
9594
if self.config.target == "wasm32-unknown-unknown" {
9695
// rustc.arg("-g"); // get any backtrace at all on errors

0 commit comments

Comments
 (0)