From d9c3ae1bb122cda3c641dc3093a6d67b89cfd2a0 Mon Sep 17 00:00:00 2001 From: Rolf Eike Beer Date: Wed, 13 Dec 2017 18:39:53 +0100 Subject: [PATCH 1/2] TravisCI: also test CMake build out of source --- .travis.sh | 7 +++++++ .travis.yml | 1 + 2 files changed, 8 insertions(+) diff --git a/.travis.sh b/.travis.sh index dec9185f..97b8c5ad 100755 --- a/.travis.sh +++ b/.travis.sh @@ -48,6 +48,13 @@ elif [[ ${MODE} = cmake ]]; then make all test make DESTDIR="${PWD}"/ROOT install ( cd ROOT/ && find | sort ) +elif [[ ${MODE} = cmake-oos ]]; then + mkdir build + cd build + cmake .. + make all test + make DESTDIR="${PWD}"/ROOT install + ( cd ROOT/ && find | sort ) else ./qa.sh "${MODE}" fi diff --git a/.travis.yml b/.travis.yml index dfc7cff5..13e45c6a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,6 +10,7 @@ env: matrix: - MODE=address - MODE=cmake + - MODE=cmake-oos - MODE=distcheck - MODE=lib-coverage From c3b63ff202b4461db0133f5c377cc61f2020d3bc Mon Sep 17 00:00:00 2001 From: Rolf Eike Beer Date: Wed, 13 Dec 2017 18:46:19 +0100 Subject: [PATCH 2/2] TravisCI: simplify printing installed files --- .travis.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.sh b/.travis.sh index 97b8c5ad..a9034583 100755 --- a/.travis.sh +++ b/.travis.sh @@ -47,14 +47,14 @@ elif [[ ${MODE} = cmake ]]; then cmake . make all test make DESTDIR="${PWD}"/ROOT install - ( cd ROOT/ && find | sort ) + find ROOT -printf "%P\n" | sort elif [[ ${MODE} = cmake-oos ]]; then mkdir build cd build cmake .. make all test make DESTDIR="${PWD}"/ROOT install - ( cd ROOT/ && find | sort ) + find ROOT -printf "%P\n" | sort else ./qa.sh "${MODE}" fi