From 355c1e946bb991564f7dfd8611ae6f3901b2ea74 Mon Sep 17 00:00:00 2001 From: Niels Lohmann Date: Tue, 23 Jan 2018 18:00:12 +0100 Subject: [PATCH] :construction_worker: added task to check amalgamation #906 - Builds and runs test cases from individual sources rather than from amalgamation. - Checks whether amalgamation would create the same single-header file as checked in. --- .travis.yml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/.travis.yml b/.travis.yml index 6391c088..6c284754 100644 --- a/.travis.yml +++ b/.travis.yml @@ -74,6 +74,20 @@ matrix: sources: ['ubuntu-toolchain-r-test'] packages: ['g++-4.9', 'ninja-build'] + # check amalgamation + - os: linux + compiler: gcc + env: + - COMPILER=g++-4.9 + - SPECIAL=amalgamation + - CMAKE_OPTIONS=-DJSON_MultipleHeader=ON + addons: + apt: + sources: ['ubuntu-toolchain-r-test'] + packages: ['g++-4.9', 'astyle', 'ninja-build'] + after_success: + - make check-amalgamation + # Coveralls (http://gronlier.fr/blog/2015/01/adding-code-coverage-to-your-c-project/) - os: linux