aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorRiccardo Spagni <ric@spagni.net>2016-08-28 22:44:37 +0200
committerRiccardo Spagni <ric@spagni.net>2016-08-28 22:44:37 +0200
commite9d4d224e38cccfdcc87e88955292d3e1fe5aa00 (patch)
treee5e656001e00a81a4ae9c19ed9639da9f2d14a97 /Makefile
parentMerge pull request #990 (diff)
parentremove -Wall from coverage arguments (diff)
downloadmonero-e9d4d224e38cccfdcc87e88955292d3e1fe5aa00.tar.xz
Merge pull request #992
f1ba51c remove -Wall from coverage arguments (Jacob Torrey) f017fec Build the core_tests under Travis (Jacob Torrey) e0bf02a Streamline release-test target (Jacob Torrey) baf4574 Update badge to point to monero's coveralls (Jacob Torrey) d1dc2c3 Re-enable Travis IRC notifications (Jacob Torrey) 9c71b9e Silence coveralls to prevent 4MB logs (Jacob Torrey) 65041fb Disabled libwallet_api_test until Issue #895 resolved (Jacob Torrey) a450138 Disable core_tests on Travis-CI (Jacob Torrey) 650afac Added -j2 to Makefile and clean up matrix (Jacob Torrey) 256dec0 Streamline test building target (Jacob Torrey) 14915c2 Ensure tests are built prior to testing (Jacob Torrey) fe4992b Added coverage g++ commands (Jacob Torrey) 497b24f Update .travis.yml (Jacob Torrey) 678467d Update for the current make environment (Jacob Torrey) abcac26 Fixed tab/space issue on YAML (Jacob Torrey) 7351a11 Converted to a build matrix for testing and release (Jacob Torrey) 342dbfb Prep for coveralls (Jacob Torrey)
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile8
1 files changed, 4 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index 69d1127de..5817a8a6b 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
@@ -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