about summary refs log tree commit diff
diff options
context:
space:
mode:
authorMatthias Krüger <matthias.krueger@famsik.de>2022-06-28 18:34:28 +0200
committerGitHub <noreply@github.com>2022-06-28 18:34:28 +0200
commit6cb46ca3821add2e7dd5983114fdf41df0e295f2 (patch)
treed61209446786754bca7c2679fbdb0f16017a6ad5
parent5c7a04553d34b9dea825b77327d3e1f308f73f8f (diff)
parentd16187c47f023601b74e41550e7e36058baa02c4 (diff)
downloadrust-6cb46ca3821add2e7dd5983114fdf41df0e295f2.tar.gz
rust-6cb46ca3821add2e7dd5983114fdf41df0e295f2.zip
Rollup merge of #98564 - jyn514:remove-tmp-dir, r=Mark-Simulacrum
Remove references to `./tmp` in-tree

These used to be used by codegen-units tests, but were switched from manually specifying directories
to just using `// incremental` in https://github.com/rust-lang/rust/pull/89101.
Remove the old references.

Fixes https://github.com/rust-lang/rust/issues/34586.
-rw-r--r--.gitignore2
-rw-r--r--src/tools/compiletest/src/main.rs5
2 files changed, 0 insertions, 7 deletions
diff --git a/.gitignore b/.gitignore
index ec6cb6ed2e4..a6625ac2ac4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -46,8 +46,6 @@ no_llvm_build
 /unicode-downloads
 /target
 /src/tools/x/target
-# Generated by compiletest for incremental
-/tmp/
 # Created by default with `src/ci/docker/run.sh`
 /obj/
 
diff --git a/src/tools/compiletest/src/main.rs b/src/tools/compiletest/src/main.rs
index e23cccf6cd1..4e8e5afd4bb 100644
--- a/src/tools/compiletest/src/main.rs
+++ b/src/tools/compiletest/src/main.rs
@@ -351,11 +351,6 @@ pub fn opt_str2(maybestr: Option<String>) -> String {
 }
 
 pub fn run_tests(config: Config) {
-    // FIXME(#33435) Avoid spurious failures in codegen-units/partitioning tests.
-    if let Mode::CodegenUnits = config.mode {
-        let _ = fs::remove_dir_all("tmp/partitioning-tests");
-    }
-
     // If we want to collect rustfix coverage information,
     // we first make sure that the coverage file does not exist.
     // It will be created later on.