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)
2025-02-07 02:55:25 -05:00 · 2016-08-28 22:44:37 +02:00 · 2016-08-28 22:44:37 +02:00 · e9d4d224e3
commit e9d4d224e3
parent fe2b0f55fe f1ba51cf89
5 changed files with 121 additions and 37 deletions
--- a/.travis.yml
+++ b/.travis.yml
@ -1,35 +1,110 @@
 sudo: required
 dist: trusty
 language: cpp
-compiler:
- gcc
- clang
-addons:
-  apt:
-    packages:
-    - build-essential
-    - cmake
-    - doxygen
-    - g++
-    - gcc
-    - clang
-    - graphviz
-    - libdb++-dev
-    - libdb-dev
-    - libgtest-dev
-    - libminiupnpc-dev
-    - libssl-dev
-    - libssl1.0.0
-    - libunbound-dev
-    - libunwind8-dev
-    sources:
-    - ubuntu-toolchain-r-test
-before_install:
- sudo add-apt-repository -y ppa:kojoley/boost
- sudo apt-get -q update
-install:
- sudo apt-get -y install libboost-{chrono,program-options,date-time,thread,system,filesystem,regex,serialization}1.58{-dev,.0}
-script: make -j2 && HAVE_DOT=YES doxygen Doxyfile
+
+matrix:
+  include:
+
+  #
+  # Coveralls.io
+  #
+  - os: linux
+    compiler: gcc
+    addons:
+      apt:
+        packages:
+          - build-essential
+          - cmake
+          - doxygen
+          - g++
+          - gcc
+          - clang
+          - graphviz
+          - libdb++-dev
+          - libdb-dev
+          - libgtest-dev
+          - libminiupnpc-dev
+          - libssl-dev
+          - libssl1.0.0
+          - libunbound-dev
+          - libunwind8-dev
+      sources:
+        - ubuntu-toolchain-r-test
+    before_install:
+      - sudo add-apt-repository -y ppa:kojoley/boost
+      - sudo apt-get -q update
+      - pip install --user cpp-coveralls
+    install:
+      - sudo apt-get -y install libboost-{chrono,program-options,date-time,thread,system,filesystem,regex,serialization}1.58{-dev,.0}
+    script:
+      - make -j2 debug-test
+    after_success:
+      - travis_wait coveralls -e external -e tests -e cmake -e contrib -e translations -e utils --gcov-options '\-lp' &> /dev/null
+
+  #
+  # Monero release-all (gcc)
+  #
+  - os: linux
+    compiler: gcc
+    addons:
+      apt:
+        packages:
+          - build-essential
+          - cmake
+          - doxygen
+          - g++
+          - gcc
+          - clang
+          - graphviz
+          - libdb++-dev
+          - libdb-dev
+          - libgtest-dev
+          - libminiupnpc-dev
+          - libssl-dev
+          - libssl1.0.0
+          - libunbound-dev
+          - libunwind8-dev
+      sources:
+        - ubuntu-toolchain-r-test
+    before_install:
+      - sudo add-apt-repository -y ppa:kojoley/boost
+      - sudo apt-get -q update
+    install:
+      - sudo apt-get -y install libboost-{chrono,program-options,date-time,thread,system,filesystem,regex,serialization}1.58{-dev,.0}
+    script:
+      - make -j2 && HAVE_DOT=YES doxygen Doxyfile
+
+  #
+  # Monero release-all (clang)
+  #
+  - os: linux
+    compiler: clang
+    addons:
+      apt:
+        packages:
+          - build-essential
+          - cmake
+          - doxygen
+          - clang
+          - graphviz
+          - libdb++-dev
+          - libdb-dev
+          - libgtest-dev
+          - libminiupnpc-dev
+          - libssl-dev
+          - libssl1.0.0
+          - libunbound-dev
+          - libunwind8-dev
+      sources:
+        - ubuntu-toolchain-r-test
+    before_install:
+      - sudo add-apt-repository -y ppa:kojoley/boost
+      - sudo apt-get -q update
+    install:
+      - sudo apt-get -y install libboost-{chrono,program-options,date-time,thread,system,filesystem,regex,serialization}1.58{-dev,.0}
+    script:
+      - make -j2 && HAVE_DOT=YES doxygen Doxyfile
+
 notifications:
  email: false
  irc:
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -388,9 +388,9 @@ else()
    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DGTEST_HAS_TR1_TUPLE=0")
  endif()
  if(CMAKE_C_COMPILER_ID STREQUAL "GNU" AND NOT (CMAKE_C_COMPILER_VERSION VERSION_LESS 4.8))
-    set(DEBUG_FLAGS "-g3 -Og")
+    set(DEBUG_FLAGS "-g3 -Og -fprofile-arcs -ftest-coverage --coverage")
  else()
-    set(DEBUG_FLAGS "-g3 -O0")
+    set(DEBUG_FLAGS "-g3 -O0 -fprofile-arcs -ftest-coverage --coverage")
  endif()

  if(NOT DEFINED USE_LTO_DEFAULT)
--- a/8
+++ b/8
@ -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
--- a/README.md
+++ b/README.md
@ -3,6 +3,7 @@
 Copyright (c) 2014-2016, The Monero Project

 [![Build Status](https://travis-ci.org/monero-project/bitmonero.svg?branch=master)](https://travis-ci.org/monero-project/bitmonero)
+[![Coverage Status](https://coveralls.io/repos/github/monero-project/bitmonero/badge.svg?branch=master)](https://coveralls.io/github/monero-project/bitmonero?branch=master)

 ## Development Resources

--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@ -63,7 +63,9 @@ add_subdirectory(unit_tests)
 add_subdirectory(difficulty)
 add_subdirectory(hash)
 add_subdirectory(net_load_tests)
-add_subdirectory(libwallet_api_tests)
+
+# Disabled until issue #895 is resolved
+#add_subdirectory(libwallet_api_tests)

 # add_subdirectory(daemon_tests)

@ -86,5 +88,11 @@ add_test(
  NAME    hash-target
  COMMAND hash-target-tests)

-add_custom_target(tests DEPENDS coretests difficulty hash performance_tests core_proxy unit_tests)
+# Skip the core_tests if we are running in Travis-CI because they will take too long
+if (DEFINED ENV{TRAVIS})
+  add_custom_target(tests DEPENDS difficulty hash performance_tests core_proxy unit_tests)
+else ()
+  add_custom_target(tests DEPENDS coretests difficulty hash performance_tests core_proxy unit_tests)
+endif ()
+
 set_property(TARGET gtest gtest_main hash-target-tests tests PROPERTY FOLDER "tests")