Skip to content

Commit f8adb8e

Browse files
test: s/GCCTEST_OUT_DIR/CC_SHIM_OUT_DIR, s/gcc-shim/cc-shim
1 parent a10fd61 commit f8adb8e

File tree

2 files changed

+8
-5
lines changed

2 files changed

+8
-5
lines changed

src/bin/gcc-shim.rs renamed to src/bin/cc-shim.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ fn main() {
1414
let program = args.next().expect("Unexpected empty args");
1515

1616
let out_dir = PathBuf::from(
17-
env::var_os("GCCTEST_OUT_DIR")
18-
.unwrap_or_else(|| panic!("{}: GCCTEST_OUT_DIR not found", program)),
17+
env::var_os("CC_SHIM_OUT_DIR")
18+
.unwrap_or_else(|| panic!("{}: CC_SHIM_OUT_DIR not found", program)),
1919
);
2020

2121
// Find the first nonexistent candidate file to which the program's args can be written.

tests/support/mod.rs

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,11 @@ impl Test {
4444
if gcc.ends_with("deps") {
4545
gcc.pop();
4646
}
47-
let td = Builder::new().prefix("gcc-test").tempdir_in(&gcc).unwrap();
48-
gcc.push(format!("gcc-shim{}", env::consts::EXE_SUFFIX));
47+
let td = Builder::new()
48+
.prefix("cc-shim-test")
49+
.tempdir_in(&gcc)
50+
.unwrap();
51+
gcc.push(format!("cc-shim{}", env::consts::EXE_SUFFIX));
4952
Test {
5053
td,
5154
gcc,
@@ -98,7 +101,7 @@ impl Test {
98101
.debug(false)
99102
.out_dir(self.td.path())
100103
.__set_env("PATH", self.path())
101-
.__set_env("GCCTEST_OUT_DIR", self.td.path());
104+
.__set_env("CC_SHIM_OUT_DIR", self.td.path());
102105
if self.msvc {
103106
cfg.compiler(self.td.path().join("cl"));
104107
cfg.archiver(self.td.path().join("lib.exe"));

0 commit comments

Comments
 (0)