diff options
| author | Eric Huss <eric@huss.org> | 2018-09-09 03:08:47 +0200 |
|---|---|---|
| committer | Matthias Krüger <matthias.krueger@famsik.de> | 2018-09-09 12:42:43 +0200 |
| commit | 60be0686e0c7135bf67d1df767cd2f792f2e94f4 (patch) | |
| tree | 3fca7fc1a2394a0339540226f7d08957f91fabcb /src/bootstrap | |
| parent | 3387f80ce39827dfa91c5559cc9999ec7737b035 (diff) | |
| download | rust-60be0686e0c7135bf67d1df767cd2f792f2e94f4.tar.gz rust-60be0686e0c7135bf67d1df767cd2f792f2e94f4.zip | |
merge cargo changes done by https://github.com/rust-lang/rust/pull/53935/
(done by matthiaskrgr, but I authored ehuss)
Diffstat (limited to 'src/bootstrap')
| -rw-r--r-- | src/bootstrap/test.rs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/bootstrap/test.rs b/src/bootstrap/test.rs index f762d9414cf..8e42c9c1ec7 100644 --- a/src/bootstrap/test.rs +++ b/src/bootstrap/test.rs @@ -237,6 +237,8 @@ impl Step for Cargo { // Don't run cross-compile tests, we may not have cross-compiled libstd libs // available. cargo.env("CFG_DISABLE_CROSS_TESTS", "1"); + // Disable a test that has issues with mingw. + cargo.env("CARGO_TEST_DISABLE_GIT_CLI", "1"); try_run( builder, |