testsuite: put everything into a single test to fix interleaved output mess

diff --git a/tests/compiletest.rs b/tests/compiletest.rs
index cfbfa70d42eea9c4e94a90e4a249b708bf339630..896d1cae5969e921c448e4df4793508f852acc5c 100644 (file)
--- a/tests/compiletest.rs
+++ b/tests/compiletest.rs
@@ -190,27 +190,12 @@ fn run_pass_miri(opt: bool) {
     miri_pass(&sysroot, "tests/run-pass-fullmir", &host, &host, true, opt);
 }
 
-#[test]
-fn run_pass_miri_noopt() {
-    run_pass_miri(false);
-}
-
-#[test]
-#[ignore]
-// FIXME: Disabled for now, as the optimizer is pretty broken and crashes...
-// See https://github.com/rust-lang/rust/issues/50411
-fn run_pass_miri_opt() {
-    run_pass_miri(true);
-}
-
-#[test]
 fn run_pass_rustc() {
     let sysroot = get_sysroot();
     rustc_pass(&sysroot, "tests/run-pass");
     rustc_pass(&sysroot, "tests/run-pass-fullmir");
 }
 
-#[test]
 fn compile_fail_miri() {
     let sysroot = get_sysroot();
     let host = get_host();
@@ -219,3 +204,20 @@ fn compile_fail_miri() {
     compile_fail(&sysroot, "tests/compile-fail", &host, &host, false);
     compile_fail(&sysroot, "tests/compile-fail-fullmir", &host, &host, true);
 }
+
+#[test]
+fn test() {
+    // We put everything into a single test to avoid the parallelism `cargo test`
+    // introduces.  We still get parallelism within our tests because `compiletest`
+    // uses `libtest` which runs jobs in parallel.
+
+    run_pass_rustc();
+
+    run_pass_miri(false);
+
+    // FIXME: Disabled for now, as the optimizer is pretty broken and crashes...
+    // See https://github.com/rust-lang/rust/issues/50411
+    //run_pass_miri(true);
+
+    compile_fail_miri();
+}