From 5af2f80fdd152bc9ffb6f19043de8967fe9d0071 Mon Sep 17 00:00:00 2001 From: Emilio Cobos Álvarez Date: Sun, 25 Mar 2018 03:29:15 +0200 Subject: pgo: Move the tests to run-make-fulldeps, and make the profile file be in the tmp directory properly. --- src/test/run-make-fulldeps/pgo-gen-lto/Makefile | 8 ++++++++ src/test/run-make-fulldeps/pgo-gen-lto/test.rs | 11 +++++++++++ src/test/run-make-fulldeps/pgo-gen/Makefile | 8 ++++++++ src/test/run-make-fulldeps/pgo-gen/test.rs | 11 +++++++++++ src/test/run-make/pgo-gen-lto/Makefile | 8 -------- src/test/run-make/pgo-gen-lto/test.rs | 11 ----------- src/test/run-make/pgo-gen/Makefile | 8 -------- src/test/run-make/pgo-gen/test.rs | 11 ----------- 8 files changed, 38 insertions(+), 38 deletions(-) create mode 100644 src/test/run-make-fulldeps/pgo-gen-lto/Makefile create mode 100644 src/test/run-make-fulldeps/pgo-gen-lto/test.rs create mode 100644 src/test/run-make-fulldeps/pgo-gen/Makefile create mode 100644 src/test/run-make-fulldeps/pgo-gen/test.rs delete mode 100644 src/test/run-make/pgo-gen-lto/Makefile delete mode 100644 src/test/run-make/pgo-gen-lto/test.rs delete mode 100644 src/test/run-make/pgo-gen/Makefile delete mode 100644 src/test/run-make/pgo-gen/test.rs (limited to 'src') diff --git a/src/test/run-make-fulldeps/pgo-gen-lto/Makefile b/src/test/run-make-fulldeps/pgo-gen-lto/Makefile new file mode 100644 index 00000000000..e8c695f52be --- /dev/null +++ b/src/test/run-make-fulldeps/pgo-gen-lto/Makefile @@ -0,0 +1,8 @@ +-include ../tools.mk + +all: +ifeq ($(PROFILER_SUPPORT),1) + $(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-fulldeps/pgo-gen-lto/test.rs b/src/test/run-make-fulldeps/pgo-gen-lto/test.rs new file mode 100644 index 00000000000..3f07b46791d --- /dev/null +++ b/src/test/run-make-fulldeps/pgo-gen-lto/test.rs @@ -0,0 +1,11 @@ +// Copyright 2018 The Rust Project Developers. See the COPYRIGHT +// file at the top-level directory of this distribution and at +// http://rust-lang.org/COPYRIGHT. +// +// Licensed under the Apache License, Version 2.0 or the MIT license +// , at your +// option. This file may not be copied, modified, or distributed +// except according to those terms. + +fn main() {} diff --git a/src/test/run-make-fulldeps/pgo-gen/Makefile b/src/test/run-make-fulldeps/pgo-gen/Makefile new file mode 100644 index 00000000000..7dc227b5a14 --- /dev/null +++ b/src/test/run-make-fulldeps/pgo-gen/Makefile @@ -0,0 +1,8 @@ +-include ../tools.mk + +all: +ifeq ($(PROFILER_SUPPORT),1) + $(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-fulldeps/pgo-gen/test.rs b/src/test/run-make-fulldeps/pgo-gen/test.rs new file mode 100644 index 00000000000..3f07b46791d --- /dev/null +++ b/src/test/run-make-fulldeps/pgo-gen/test.rs @@ -0,0 +1,11 @@ +// Copyright 2018 The Rust Project Developers. See the COPYRIGHT +// file at the top-level directory of this distribution and at +// http://rust-lang.org/COPYRIGHT. +// +// Licensed under the Apache License, Version 2.0 or the MIT license +// , at your +// option. This file may not be copied, modified, or distributed +// except according to those terms. + +fn main() {} diff --git a/src/test/run-make/pgo-gen-lto/Makefile b/src/test/run-make/pgo-gen-lto/Makefile deleted file mode 100644 index 5de2c707f35..00000000000 --- a/src/test/run-make/pgo-gen-lto/Makefile +++ /dev/null @@ -1,8 +0,0 @@ --include ../tools.mk - -all: -ifeq ($(PROFILER_SUPPORT),1) - $(RUSTC) -Copt-level=3 -Clto=fat -Z pgo-gen=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/pgo-gen-lto/test.rs deleted file mode 100644 index 3f07b46791d..00000000000 --- a/src/test/run-make/pgo-gen-lto/test.rs +++ /dev/null @@ -1,11 +0,0 @@ -// Copyright 2018 The Rust Project Developers. See the COPYRIGHT -// file at the top-level directory of this distribution and at -// http://rust-lang.org/COPYRIGHT. -// -// Licensed under the Apache License, Version 2.0 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - -fn main() {} diff --git a/src/test/run-make/pgo-gen/Makefile b/src/test/run-make/pgo-gen/Makefile deleted file mode 100644 index bc5cef2370c..00000000000 --- a/src/test/run-make/pgo-gen/Makefile +++ /dev/null @@ -1,8 +0,0 @@ --include ../tools.mk - -all: -ifeq ($(PROFILER_SUPPORT),1) - $(RUSTC) -g -Z pgo-gen=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/pgo-gen/test.rs deleted file mode 100644 index 3f07b46791d..00000000000 --- a/src/test/run-make/pgo-gen/test.rs +++ /dev/null @@ -1,11 +0,0 @@ -// Copyright 2018 The Rust Project Developers. See the COPYRIGHT -// file at the top-level directory of this distribution and at -// http://rust-lang.org/COPYRIGHT. -// -// Licensed under the Apache License, Version 2.0 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - -fn main() {} -- cgit 1.4.1-3-g733a5