Skip to content

Commit

Permalink
Merge 6d223db into 53a837a
Browse files Browse the repository at this point in the history
  • Loading branch information
GDYendell committed Jan 20, 2017
2 parents 53a837a + 6d223db commit 32566da
Show file tree
Hide file tree
Showing 7 changed files with 684 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@
/.project
/.pydevproject
.project

.idea
10 changes: 7 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
language: cpp
sudo: false
sudo: required

matrix:
include:
Expand All @@ -10,7 +10,10 @@ matrix:
packages: ['liblog4cxx10-dev','libboost-program-options-dev','libboost-filesystem-dev','libboost-date-time-dev','libboost-system-dev','libboost-test-dev','libboost-thread-dev','libzmq3-dev']
env: PYTHONPATH=./lib/python FR_TEST_CONFIG=test_config/fr_test.config FP_TEST_CONFIG=test_config/fp_test.config HDF5_ROOT=$HOME/hdf5-1.8.16
before_install:
- bash .travis-install-hdf5.sh
- bash .travis-install-hdf5.sh
- sudo apt-get install -y -qq lcov curl
- export COVERALLS_SERVICE_NAME=travis-ci
- export COVERALLS_REPO_TOKEN=Aa9l1gFhHsaLtNWpeKKj4kTzMTFbQI5m2
cache:
directories:
- $HOME/hdf5-1.8.16
Expand All @@ -29,7 +32,7 @@ matrix:
install:
- mkdir -p build
- cd build
- cmake -DHDF5_ROOT=$HDF5_ROOT ..
- cmake -DHDF5_ROOT=$HDF5_ROOT -DCOVERALLS=ON -DCMAKE_BUILD_TYPE=Debug ..
- make -j VERBOSE=1
- HDF5_DIR=$HDF5_ROOT pip install --user h5py
- pip install --user -r $PYTHONPATH/requirements-travis.txt
Expand All @@ -38,6 +41,7 @@ script:
- bin/frameReceiverTest --log_level=all
# - python bin/run_integration_test.py --frames=1 --interval=1.0 --timeout=30 --fr_config=$FR_TEST_CONFIG --fp_config=$FP_TEST_CONFIG
- bin/fileWriterTest --log_level=all
- make coveralls

notifications:
slack:
Expand Down
34 changes: 34 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,40 @@ set(CMAKE_CONFIG_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/test_config)
# directories of additional CMake modules (ie. MacroOutOfSourceBuild.cmake):
set(CMAKE_MODULE_PATH ${frameReceiver_SOURCE_DIR}/cmake ${CMAKE_MODULE_PATH})

# Coverage configuration
option(COVERALLS "Generate coveralls data" OFF)

if (COVERALLS)
include(Coveralls)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -O0 -fprofile-arcs -ftest-coverage")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g -O0 -fprofile-arcs -ftest-coverage")

set(FR_SRC src)
set(FW_SRC tools/filewriter)

set(COVERAGE_SRCS
${FR_SRC}/appMain.cpp ${FR_SRC}/FrameReceiverApp.cpp ${FR_SRC}/FrameReceiverRxThread.cpp
${FR_SRC}/FrameReceiverApp.cpp ${FR_SRC}/IpcChannel.cpp ${FR_SRC}/IpcMessage.cpp ${FR_SRC}/IpcReactor.cpp
${FR_SRC}/PercivalEmulatorFrameDecoder.cpp ${FR_SRC}/SharedBufferManager.cpp
${FW_SRC}/DataBlock.cpp ${FW_SRC}/DataBlockPool.cpp ${FW_SRC}/DataBlock.cpp ${FW_SRC}/DummyPlugin.cpp
${FW_SRC}/ExcaliburReorderPlugin.cpp ${FW_SRC}/FileWriter.cpp ${FW_SRC}/fileWriterApp.cpp
${FW_SRC}/FileWriterController.cpp ${FW_SRC}/FileWriterPlugin.cpp ${FW_SRC}/Frame.cpp
${FW_SRC}/IFrameCallback.cpp ${FW_SRC}/PercivalProcessPlugin.cpp ${FW_SRC}/SharedMemoryController.cpp
${FW_SRC}/SharedMemoryParser.cpp
)

# Create the coveralls target.
coveralls_setup(
"${COVERAGE_SRCS}" # The source files
ON # If we should upload.
"${PROJECT_SOURCE_DIR}/cmake")

enable_testing()
add_test(frame_receiver_test ${PROJECT_SOURCE_DIR}/build/bin/frameReceiverTest)
add_test(file_writer_test ${PROJECT_SOURCE_DIR}/build/bin/fileWriterTest)

endif()

# Find and add external packages required for application and test
find_package( Boost 1.41.0
REQUIRED
Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ as a UDP stream. FrameReceiver constructs data frames in shared memory buffers a
applications to allow processing and storage.

[![Build Status](https://travis-ci.org/percival-detector/odin-data.svg)](https://travis-ci.org/percival-detector/odin-data)
[![Coverage Status](https://coveralls.io/repos/github/percival-detector/odin-data/badge.svg?branch=master)](https://coveralls.io/github/percival-detector/odin-data?branch=master)
[![Stories in Ready](https://badge.waffle.io/percival-detector/odin-data.png?label=ready&title=Ready)](https://waffle.io/percival-detector/odin-data)
[![Stories in In Progress](https://badge.waffle.io/percival-detector/odin-data.png?label=In%20Progress&title=In%20Progress)](https://waffle.io/percival-detector/odin-data)

Expand Down
128 changes: 128 additions & 0 deletions cmake/Coveralls.cmake
Original file line number Diff line number Diff line change
@@ -0,0 +1,128 @@
#
# The MIT License (MIT)
#
# Permission is hereby granted, free of charge, to any person obtaining a copy
# of this software and associated documentation files (the "Software"), to deal
# in the Software without restriction, including without limitation the rights
# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
# copies of the Software, and to permit persons to whom the Software is
# furnished to do so, subject to the following conditions:
#
# The above copyright notice and this permission notice shall be included in all
# copies or substantial portions of the Software.
#
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
# SOFTWARE.
#
# Copyright (C) 2014 Joakim Söderberg <joakim.soderberg@gmail.com>
#

set(_CMAKE_SCRIPT_PATH ${CMAKE_CURRENT_LIST_DIR}) # must be outside coveralls_setup() to get correct path

#
# Param _COVERAGE_SRCS A list of source files that coverage should be collected for.
# Param _COVERALLS_UPLOAD Upload the result to coveralls?
#

function(coveralls_setup _COVERAGE_SRCS _COVERALLS_UPLOAD)

if (ARGC GREATER 2)
set(_CMAKE_SCRIPT_PATH ${ARGN})
message(STATUS "Coveralls: Using alternate CMake script dir: ${_CMAKE_SCRIPT_PATH}")
endif()

if (NOT EXISTS "${_CMAKE_SCRIPT_PATH}/CoverallsClear.cmake")
message(FATAL_ERROR "Coveralls: Missing ${_CMAKE_SCRIPT_PATH}/CoverallsClear.cmake")
endif()

if (NOT EXISTS "${_CMAKE_SCRIPT_PATH}/CoverallsGenerateGcov.cmake")
message(FATAL_ERROR "Coveralls: Missing ${_CMAKE_SCRIPT_PATH}/CoverallsGenerateGcov.cmake")
endif()

# When passing a CMake list to an external process, the list
# will be converted from the format "1;2;3" to "1 2 3".
# This means the script we're calling won't see it as a list
# of sources, but rather just one long path. We remedy this
# by replacing ";" with "*" and then reversing that in the script
# that we're calling.
# http://cmake.3232098.n2.nabble.com/Passing-a-CMake-list-quot-as-is-quot-to-a-custom-target-td6505681.html
set(COVERAGE_SRCS_TMP ${_COVERAGE_SRCS})
set(COVERAGE_SRCS "")
foreach (COVERAGE_SRC ${COVERAGE_SRCS_TMP})
set(COVERAGE_SRCS "${COVERAGE_SRCS}*${COVERAGE_SRC}")
endforeach()

#message("Coverage sources: ${COVERAGE_SRCS}")
set(COVERALLS_FILE ${PROJECT_BINARY_DIR}/coveralls.json)

add_custom_target(coveralls_generate

# Zero the coverage counters.
COMMAND ${CMAKE_COMMAND} -DPROJECT_BINARY_DIR="${PROJECT_BINARY_DIR}" -P "${_CMAKE_SCRIPT_PATH}/CoverallsClear.cmake"

# Run regress tests.
COMMAND ${CMAKE_CTEST_COMMAND} --output-on-failure

# Generate Gcov and translate it into coveralls JSON.
# We do this by executing an external CMake script.
# (We don't want this to run at CMake generation time, but after compilation and everything has run).
COMMAND ${CMAKE_COMMAND}
-DCOVERAGE_SRCS="${COVERAGE_SRCS}" # TODO: This is passed like: "a b c", not "a;b;c"
-DCOVERALLS_OUTPUT_FILE="${COVERALLS_FILE}"
-DCOV_PATH="${PROJECT_BINARY_DIR}"
-DPROJECT_ROOT="${PROJECT_SOURCE_DIR}"
-P "${_CMAKE_SCRIPT_PATH}/CoverallsGenerateGcov.cmake"

WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
COMMENT "Generating coveralls output..."
)

if (_COVERALLS_UPLOAD)
message("COVERALLS UPLOAD: ON")

find_program(CURL_EXECUTABLE curl)

if (NOT CURL_EXECUTABLE)
message(FATAL_ERROR "Coveralls: curl not found! Aborting")
endif()

add_custom_target(coveralls_upload
# Upload the JSON to coveralls.
COMMAND ${CURL_EXECUTABLE}
-S -F json_file=@${COVERALLS_FILE}
https://coveralls.io/api/v1/jobs

DEPENDS coveralls_generate

WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
COMMENT "Uploading coveralls output...")

add_custom_target(coveralls DEPENDS coveralls_upload)
else()
message("COVERALLS UPLOAD: OFF")
add_custom_target(coveralls DEPENDS coveralls_generate)
endif()

endfunction()

macro(coveralls_turn_on_coverage)
if(NOT (CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX)
AND (NOT "${CMAKE_C_COMPILER_ID}" STREQUAL "Clang"))
message(FATAL_ERROR "Coveralls: Compiler ${CMAKE_C_COMPILER_ID} is not GNU gcc! Aborting... You can set this on the command line using CC=/usr/bin/gcc CXX=/usr/bin/g++ cmake <options> ..")
endif()

if(NOT CMAKE_BUILD_TYPE STREQUAL "Debug")
message(FATAL_ERROR "Coveralls: Code coverage results with an optimised (non-Debug) build may be misleading! Add -DCMAKE_BUILD_TYPE=Debug")
endif()

set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -O0 -fprofile-arcs -ftest-coverage")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g -O0 -fprofile-arcs -ftest-coverage")
endmacro()



31 changes: 31 additions & 0 deletions cmake/CoverallsClear.cmake
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
#
# The MIT License (MIT)
#
# Permission is hereby granted, free of charge, to any person obtaining a copy
# of this software and associated documentation files (the "Software"), to deal
# in the Software without restriction, including without limitation the rights
# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
# copies of the Software, and to permit persons to whom the Software is
# furnished to do so, subject to the following conditions:
#
# The above copyright notice and this permission notice shall be included in all
# copies or substantial portions of the Software.
#
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
# SOFTWARE.
#
# Copyright (C) 2014 Joakim Söderberg <joakim.soderberg@gmail.com>
#

# do not follow symlinks in file(GLOB_RECURSE ...)
cmake_policy(SET CMP0009 NEW)

file(GLOB_RECURSE GCDA_FILES "${PROJECT_BINARY_DIR}/*.gcda")
if(NOT GCDA_FILES STREQUAL "")
file(REMOVE ${GCDA_FILES})
endif()
Loading

0 comments on commit 32566da

Please sign in to comment.