rottenwheel/monero
1
0
Fork 0
mirror of https://codeberg.org/anoncontributorxmr/monero.git synced 2024-11-26 09:24:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #992

Browse source 
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)
This commit is contained in:
Riccardo Spagni 2016-08-28 22:44:37 +02:00
commit e9d4d224e3
No known key found for this signature in database
GPG key ID: 55432DF31CCD4FCD
5 changed files with 121 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

133
.travis.yml
View file

@ -1,35 +1,110 @@
sudo: required sudo: required
dist: trusty dist: trusty
language: cpp language: cpp
compiler:
- gcc matrix:
- clang include:
addons:
apt: #
packages: # Coveralls.io
- build-essential #
- cmake - os: linux
- doxygen compiler: gcc
- g++ addons:
- gcc apt:
- clang packages:
- graphviz - build-essential
- libdb++-dev - cmake
- libdb-dev - doxygen
- libgtest-dev - g++
- libminiupnpc-dev - gcc
- libssl-dev - clang
- libssl1.0.0 - graphviz
- libunbound-dev - libdb++-dev
- libunwind8-dev - libdb-dev
sources: - libgtest-dev
- ubuntu-toolchain-r-test - libminiupnpc-dev
before_install: - libssl-dev
- sudo add-apt-repository -y ppa:kojoley/boost - libssl1.0.0
- sudo apt-get -q update - libunbound-dev
install: - libunwind8-dev
- sudo apt-get -y install libboost-{chrono,program-options,date-time,thread,system,filesystem,regex,serialization}1.58{-dev,.0} sources:
script: make -j2 && HAVE_DOT=YES doxygen Doxyfile - 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: notifications:
email: false email: false
irc: irc:

4
CMakeLists.txt
View file

@ -388,9 +388,9 @@ else()
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DGTEST_HAS_TR1_TUPLE=0") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DGTEST_HAS_TR1_TUPLE=0")
endif() endif()
if(CMAKE_C_COMPILER_ID STREQUAL "GNU" AND NOT (CMAKE_C_COMPILER_VERSION VERSION_LESS 4.8)) 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() else()
set(DEBUG_FLAGS "-g3 -O0") set(DEBUG_FLAGS "-g3 -O0 -fprofile-arcs -ftest-coverage --coverage")
endif() endif()
if(NOT DEFINED USE_LTO_DEFAULT) if(NOT DEFINED USE_LTO_DEFAULT)

8
Makefile
View file

@ -35,9 +35,9 @@ cmake-debug:
debug: cmake-debug debug: cmake-debug
cd build/debug && $(MAKE) cd build/debug && $(MAKE)
debug-test: debug debug-test:
mkdir -p build/debug 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: debug-all:
mkdir -p build/debug mkdir -p build/debug
@ -50,9 +50,9 @@ cmake-release:
release: cmake-release release: cmake-release
cd build/release && $(MAKE) cd build/release && $(MAKE)
release-test: release release-test:
mkdir -p build/release 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: release-all:
mkdir -p build/release mkdir -p build/release

1
README.md
View file

@ -3,6 +3,7 @@
Copyright (c) 2014-2016, The Monero Project 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) [![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 ## Development Resources

12
tests/CMakeLists.txt
View file

@ -63,7 +63,9 @@ add_subdirectory(unit_tests)
add_subdirectory(difficulty) add_subdirectory(difficulty)
add_subdirectory(hash) add_subdirectory(hash)
add_subdirectory(net_load_tests) 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) # add_subdirectory(daemon_tests)
@ -86,5 +88,11 @@ add_test(
NAME hash-target NAME hash-target
COMMAND hash-target-tests) 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") set_property(TARGET gtest gtest_main hash-target-tests tests PROPERTY FOLDER "tests")