From 256dec06016650128ca3d59d541a1a335b948331 Mon Sep 17 00:00:00 2001 From: Jacob Torrey Date: Mon, 22 Aug 2016 17:43:43 -0600 Subject: Streamline test building target Signed-off-by: Jacob Torrey --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 69d1127de..cade2b8aa 100644 --- a/Makefile +++ b/Makefile @@ -35,9 +35,9 @@ cmake-debug: debug: cmake-debug cd build/debug && $(MAKE) -debug-test: debug +debug-test: mkdir -p build/debug - cd build/debug && cmake -D BUILD_TESTS=ON -D CMAKE_BUILD_TYPE=Debug ../.. && $(MAKE) test + cd build/debug && cmake -D BUILD_TESTS=ON -D CMAKE_BUILD_TYPE=Debug ../.. && $(MAKE) && $(MAKE) test debug-all: mkdir -p build/debug -- cgit v1.2.3 From e0bf02a6ce17bbcd8a91743dd3273a6d33040598 Mon Sep 17 00:00:00 2001 From: Jacob Torrey Date: Fri, 26 Aug 2016 13:50:03 -0600 Subject: Streamline release-test target When Travis builds and tests, time is limited per build, so the overhead of re-calling CMake can push it over the limit. --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index cade2b8aa..5817a8a6b 100644 --- a/Makefile +++ b/Makefile @@ -50,9 +50,9 @@ cmake-release: release: cmake-release cd build/release && $(MAKE) -release-test: release +release-test: mkdir -p build/release - cd build/release && cmake -D BUILD_TESTS=ON -D CMAKE_BUILD_TYPE=release ../.. && $(MAKE) test + cd build/release && cmake -D BUILD_TESTS=ON -D CMAKE_BUILD_TYPE=release ../.. && $(MAKE) && $(MAKE) test release-all: mkdir -p build/release -- cgit v1.2.3