summary refs log tree commit diff
path: root/src/compiletest
diff options
context:
space:
mode:
authorSteve Klabnik <steve@steveklabnik.com>2015-01-22 18:10:00 -0500
committerSteve Klabnik <steve@steveklabnik.com>2015-01-22 18:10:00 -0500
commitdc27d29297e704d89e1a7fadbeafd44552bb2b93 (patch)
tree001ae0f06a37e7c07cae7d9d751903624c9a9334 /src/compiletest
parentacd044c2555e2a0d014569a59f72c595a2ec03b5 (diff)
parenta2936a3a69ae80693cedfac0a461754881d9a90e (diff)
downloadrust-dc27d29297e704d89e1a7fadbeafd44552bb2b93.tar.gz
rust-dc27d29297e704d89e1a7fadbeafd44552bb2b93.zip
Rollup merge of #21496 - ColonelJ:paatch, r=alexcrichton
Make compiletest set an environment variable so that on Windows 32-bit test executables containing certain substrings (e.g. 'install', 'setup', 'update', 'patch') are not blocked by UAC's Installer Detection Technology.
Diffstat (limited to 'src/compiletest')
-rw-r--r--src/compiletest/compiletest.rs3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/compiletest/compiletest.rs b/src/compiletest/compiletest.rs
index 1a9a1c08b07..b3f0034ca89 100644
--- a/src/compiletest/compiletest.rs
+++ b/src/compiletest/compiletest.rs
@@ -248,6 +248,9 @@ pub fn run_tests(config: &Config) {
     // parallel (especially when we have lots and lots of child processes).
     // For context, see #8904
     io::test::raise_fd_limit();
+    // Prevent issue #21352 UAC blocking .exe containing 'patch' etc. on Windows
+    // If #11207 is resolved (adding manifest to .exe) this becomes unnecessary
+    os::setenv("__COMPAT_LAYER", "RunAsInvoker");
     let res = test::run_tests_console(&opts, tests.into_iter().collect());
     match res {
         Ok(true) => {}