From 91049bb199246f27a2cdd49802e2e088da01632a Mon Sep 17 00:00:00 2001 From: Erwin Janssen Date: Mon, 8 Aug 2016 12:08:42 +0200 Subject: [PATCH] Travis: Install Criterion Adds the installation of Criterion to the `install` step in the Travis configuration. A submodule is used so changes in the Criterion repository can't break the build. A submodule points to a specific commit. --- .gitmodules | 3 +++ .travis.yml | 14 +++++++++++++- dependencies/criterion | 1 + 3 files changed, 17 insertions(+), 1 deletion(-) create mode 160000 dependencies/criterion diff --git a/.gitmodules b/.gitmodules index b0df38906..d27661cdb 100644 --- a/.gitmodules +++ b/.gitmodules @@ -22,3 +22,6 @@ [submodule "windows/dependencies/graphviz-build-utilities"] path = windows/dependencies/graphviz-build-utilities url = https://github.com/ErwinJanssen/graphviz-build-utilities.git +[submodule "dependencies/criterion"] + path = dependencies/criterion + url = https://github.com/Snaipe/Criterion.git diff --git a/.travis.yml b/.travis.yml index 15aa9274f..4ecf5935a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,5 @@ language: c -sudo: false +sudo: true addons: apt: packages: @@ -9,7 +9,19 @@ addons: - libdevil-dev - libxaw7-dev - freeglut3-dev + +install: +# Install unit testing framework Criterion. +- cd dependencies/criterion +- mkdir build +- cd build +- cmake .. +- cmake --build . +- sudo make install +- sudo ldconfig + script: +- cd ${TRAVIS_BUILD_DIR} - GRAPHVIZ_DESTINATION_FOLDER="graphviz-build" - "./autogen.sh NOCONFIG" - "./configure --prefix=${TRAVIS_BUILD_DIR}/${GRAPHVIZ_DESTINATION_FOLDER}" diff --git a/dependencies/criterion b/dependencies/criterion new file mode 160000 index 000000000..9fbd28bf6 --- /dev/null +++ b/dependencies/criterion @@ -0,0 +1 @@ +Subproject commit 9fbd28bf69f2f0ef0136dec70a79f7a41e9f728e -- 2.40.0