about summary refs log tree commit diff
path: root/src/bootstrap
diff options
context:
space:
mode:
authorMazdak Farrokhzad <twingoow@gmail.com>2019-04-25 03:05:22 +0200
committerGitHub <noreply@github.com>2019-04-25 03:05:22 +0200
commitbb892be98edeced022881397b1d64b968943aea7 (patch)
tree43224d29b29d4e93edbf5cdc6562a3f25077fe84 /src/bootstrap
parenta552bebaf60cfdce1a53241ce78462415ae3125c (diff)
parentff976fe0f13491f0e6d3f7cbd52ab409fd93165a (diff)
downloadrust-bb892be98edeced022881397b1d64b968943aea7.tar.gz
rust-bb892be98edeced022881397b1d64b968943aea7.zip
Rollup merge of #60038 - michaelwoerister:pgo-updates-2, r=alexcrichton
Add codegen test for PGO instrumentation.

This PR adds a codegen test that makes sure that LLVM actually generates instrumentation code when we enable PGO instrumentation in `rustc`.

The second commit updates a test case to the new commandline option syntax introduced in #59874. Without the fix the test still works, but it confusingly creates a directory called `test.profraw`, which usually is the name of the _file_ where profiling data is collected.
Diffstat (limited to 'src/bootstrap')
-rw-r--r--src/bootstrap/test.rs4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/bootstrap/test.rs b/src/bootstrap/test.rs
index c552f607960..a443b7b5863 100644
--- a/src/bootstrap/test.rs
+++ b/src/bootstrap/test.rs
@@ -1268,11 +1268,11 @@ impl Step for Compiletest {
         builder.add_rust_test_threads(&mut cmd);
 
         if builder.config.sanitizers {
-            cmd.env("SANITIZER_SUPPORT", "1");
+            cmd.env("RUSTC_SANITIZER_SUPPORT", "1");
         }
 
         if builder.config.profiler {
-            cmd.env("PROFILER_SUPPORT", "1");
+            cmd.env("RUSTC_PROFILER_SUPPORT", "1");
         }
 
         cmd.env("RUST_TEST_TMPDIR", builder.out.join("tmp"));