aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacob Torrey <discipleofranok@gmail.com>2016-08-22 17:43:43 -0600
committerJacob Torrey <torreyj@ainfosec.com>2016-08-26 14:03:27 -0600
commit256dec06016650128ca3d59d541a1a335b948331 (patch)
treed686898be6679f2b8007dbabd5f19c008e86e3bc
parentEnsure tests are built prior to testing (diff)
downloadmonero-256dec06016650128ca3d59d541a1a335b948331.tar.xz
Streamline test building target
Signed-off-by: Jacob Torrey <discipleofranok@gmail.com>
-rw-r--r--.travis.yml1
-rw-r--r--Makefile4
2 files changed, 2 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml
index 17aa983ef..9ac347ab0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -38,7 +38,6 @@ matrix:
install:
- sudo apt-get -y install libboost-{chrono,program-options,date-time,thread,system,filesystem,regex,serialization}1.58{-dev,.0}
script:
- - make debug-all
- make debug-test
after_success:
- coveralls --exclude external --exclude tests -e cmake -e contrib -e translations -e utils --gcov-options '\-lp'
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