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.

diff --git a/.gitmodules b/.gitmodules
index b0df38906f7060ab43d55516e4713a673133b012..d27661cdb4685d05ec8fbf578dec40aa441360d0 100644 (file)
--- 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 15aa9274f5f5f7bcc81921524aed09183ce7b8a1..4ecf5935a19a2301289087ab414aaa45ebc94c18 100644 (file)
--- 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 (submodule)
index 0000000..9fbd28b
--- /dev/null
+++ b/dependencies/criterion
@@ -0,0 +1 @@
+Subproject commit 9fbd28bf69f2f0ef0136dec70a79f7a41e9f728e