Skip to content

Commit 2c521ae

Browse files
Pass RUSTC_FORCE_INCREMENTAL to auxiliary tests
This won't enable incremental if -Cincremental is not already passed, but is seemingly necessary in the presence of -Zincremental-verify-ich which does not check for incremental being enabled before accessing incremental data structures, leading to an ICE.
1 parent ff12b11 commit 2c521ae

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

src/tools/compiletest/src/runtest.rs

+3-1
Original file line numberDiff line numberDiff line change
@@ -1784,7 +1784,9 @@ impl<'test> TestCx<'test> {
17841784
/// Returns whether or not it is a dylib.
17851785
fn build_auxiliary(&self, source_path: &str, aux_dir: &Path) -> bool {
17861786
let aux_testpaths = self.compute_aux_test_paths(source_path);
1787-
let aux_props = self.props.from_aux_file(&aux_testpaths.file, self.revision, self.config);
1787+
let mut aux_props =
1788+
self.props.from_aux_file(&aux_testpaths.file, self.revision, self.config);
1789+
aux_props.rustc_env.push((String::from("RUSTC_FORCE_INCREMENTAL"), String::from("1")));
17881790
let aux_output = TargetLocation::ThisDirectory(self.aux_output_dir_name());
17891791
let aux_cx = TestCx {
17901792
config: self.config,

0 commit comments

Comments
 (0)