Skip to content

Commit 6af9315

Browse files
committed
Avoid output file collisions on revisions
1 parent ec9c14f commit 6af9315

File tree

3 files changed

+3
-1
lines changed

3 files changed

+3
-1
lines changed

examples_tests/rustc_basic/executable.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
//@run
2+
//@revisions: a b c d e f g h i j k l m n
23

34
fn main() {
45
std::thread::sleep(std::time::Duration::from_secs(5));

src/per_test_config.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,7 @@ impl TestConfig {
136136
cmd.arg(self.status.path());
137137
if !self.status.revision().is_empty() {
138138
cmd.arg(format!("--cfg={}", self.status.revision()));
139+
cmd.arg(format!("-Cextra-filename={}", self.status.revision()));
139140
}
140141
for r in self.comments() {
141142
cmd.args(&r.compile_flags);

tests/integrations/basic-fail/Cargo.stdout

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -817,7 +817,7 @@ full stdout:
817817

818818

819819
FAILED TEST: tests/actual_tests_bless/revisions_bad.rs (revision `bar`)
820-
command: "rustc" "--error-format=json" "--out-dir" "$TMP "tests/actual_tests_bless/revisions_bad.rs" "--cfg=bar" "--extern" "basic_fail=$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug/libbasic_fail.rlib" "--extern" "basic_fail=$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug/libbasic_fail-$HASH.rmeta" "-L" "$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug" "-L" "$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug" "--edition" "2021"
820+
command: "rustc" "--error-format=json" "--out-dir" "$TMP "tests/actual_tests_bless/revisions_bad.rs" "--cfg=bar" "-Cextra-filename=bar" "--extern" "basic_fail=$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug/libbasic_fail.rlib" "--extern" "basic_fail=$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug/libbasic_fail-$HASH.rmeta" "-L" "$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug" "-L" "$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug" "--edition" "2021"
821821

822822
error: ``main` function not found in crate `revisions_bad`` not found in diagnostics outside the testfile
823823
--> tests/actual_tests_bless/revisions_bad.rs:4:31

0 commit comments

Comments
 (0)