File tree Expand file tree Collapse file tree 2 files changed +8
-5
lines changed Expand file tree Collapse file tree 2 files changed +8
-5
lines changed Original file line number Diff line number Diff line change @@ -14,8 +14,8 @@ fn main() {
14
14
let program = args. next ( ) . expect ( "Unexpected empty args" ) ;
15
15
16
16
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) ) ,
19
19
) ;
20
20
21
21
// Find the first nonexistent candidate file to which the program's args can be written.
Original file line number Diff line number Diff line change @@ -44,8 +44,11 @@ impl Test {
44
44
if gcc. ends_with ( "deps" ) {
45
45
gcc. pop ( ) ;
46
46
}
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 ) ) ;
49
52
Test {
50
53
td,
51
54
gcc,
@@ -98,7 +101,7 @@ impl Test {
98
101
. debug ( false )
99
102
. out_dir ( self . td . path ( ) )
100
103
. __set_env ( "PATH" , self . path ( ) )
101
- . __set_env ( "GCCTEST_OUT_DIR " , self . td . path ( ) ) ;
104
+ . __set_env ( "CC_SHIM_OUT_DIR " , self . td . path ( ) ) ;
102
105
if self . msvc {
103
106
cfg. compiler ( self . td . path ( ) . join ( "cl" ) ) ;
104
107
cfg. archiver ( self . td . path ( ) . join ( "lib.exe" ) ) ;
You can’t perform that action at this time.
0 commit comments