From 5af2f80fdd152bc9ffb6f19043de8967fe9d0071 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= <emilio@crisal.io>
Date: Sun, 25 Mar 2018 03:29:15 +0200
Subject: [PATCH] pgo: Move the tests to run-make-fulldeps, and make the
 profile file be in the tmp directory properly.

---
 src/test/{run-make => run-make-fulldeps}/pgo-gen-lto/Makefile | 2 +-
 src/test/{run-make => run-make-fulldeps}/pgo-gen-lto/test.rs  | 0
 src/test/{run-make => run-make-fulldeps}/pgo-gen/Makefile     | 2 +-
 src/test/{run-make => run-make-fulldeps}/pgo-gen/test.rs      | 0
 4 files changed, 2 insertions(+), 2 deletions(-)
 rename src/test/{run-make => run-make-fulldeps}/pgo-gen-lto/Makefile (67%)
 rename src/test/{run-make => run-make-fulldeps}/pgo-gen-lto/test.rs (100%)
 rename src/test/{run-make => run-make-fulldeps}/pgo-gen/Makefile (73%)
 rename src/test/{run-make => run-make-fulldeps}/pgo-gen/test.rs (100%)

diff --git a/src/test/run-make/pgo-gen-lto/Makefile b/src/test/run-make-fulldeps/pgo-gen-lto/Makefile
similarity index 67%
rename from src/test/run-make/pgo-gen-lto/Makefile
rename to src/test/run-make-fulldeps/pgo-gen-lto/Makefile
index 5de2c707f35..e8c695f52be 100644
--- a/src/test/run-make/pgo-gen-lto/Makefile
+++ b/src/test/run-make-fulldeps/pgo-gen-lto/Makefile
@@ -2,7 +2,7 @@
 
 all:
 ifeq ($(PROFILER_SUPPORT),1)
-	$(RUSTC) -Copt-level=3 -Clto=fat -Z pgo-gen=test.profraw test.rs
+	$(RUSTC) -Copt-level=3 -Clto=fat -Z pgo-gen="$(TMPDIR)/test.profraw" test.rs
 	$(call RUN,test) || exit 1
 	[ -e "$(TMPDIR)/test.profraw" ] || (echo "No .profraw file"; exit 1)
 endif
diff --git a/src/test/run-make/pgo-gen-lto/test.rs b/src/test/run-make-fulldeps/pgo-gen-lto/test.rs
similarity index 100%
rename from src/test/run-make/pgo-gen-lto/test.rs
rename to src/test/run-make-fulldeps/pgo-gen-lto/test.rs
diff --git a/src/test/run-make/pgo-gen/Makefile b/src/test/run-make-fulldeps/pgo-gen/Makefile
similarity index 73%
rename from src/test/run-make/pgo-gen/Makefile
rename to src/test/run-make-fulldeps/pgo-gen/Makefile
index bc5cef2370c..7dc227b5a14 100644
--- a/src/test/run-make/pgo-gen/Makefile
+++ b/src/test/run-make-fulldeps/pgo-gen/Makefile
@@ -2,7 +2,7 @@
 
 all:
 ifeq ($(PROFILER_SUPPORT),1)
-	$(RUSTC) -g -Z pgo-gen=test.profraw test.rs
+	$(RUSTC) -g -Z pgo-gen="$(TMPDIR)/test.profraw" test.rs
 	$(call RUN,test) || exit 1
 	[ -e "$(TMPDIR)/test.profraw" ] || (echo "No .profraw file"; exit 1)
 endif
diff --git a/src/test/run-make/pgo-gen/test.rs b/src/test/run-make-fulldeps/pgo-gen/test.rs
similarity index 100%
rename from src/test/run-make/pgo-gen/test.rs
rename to src/test/run-make-fulldeps/pgo-gen/test.rs