From 66ffb2a0ae9c24e4650936599e74aabceb26ca97 Mon Sep 17 00:00:00 2001
From: Matthias Kuhn <matthias.kuhn@gmx.ch>
Date: Tue, 18 Nov 2014 12:11:24 +0100
Subject: [PATCH] Run build within ctest script and add some information for
 the dashboard

---
 .travis.yml            |  3 +--
 qgis-test-travis.ctest | 36 ++++++++++++++++++++++++++++++++++++
 2 files changed, 37 insertions(+), 2 deletions(-)
 create mode 100644 qgis-test-travis.ctest

diff --git a/.travis.yml b/.travis.yml
index 74eff809376..f851714ea33 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,6 +14,5 @@ install:
   - mkdir build
   - cd build
   - cmake -DWITH_MAPSERVER=ON -DWITH_STAGED_PLUGINS=OFF -DWITH_GRASS=OFF -DSUPPRESS_QT_WARNINGS=ON ..
-  - make -j2
 
-script: xvfb-run ctest -j2 --output-on-failure -E 'PyQgsPalLabelingCanvas|PyQgsPalLabelingServer|PyQgsSymbolLayerV2|qgis_atlascompositiontest|PyQgsAtlasComposition' -D Experimental
+script: xvfb-run ctest -V -E 'PyQgsPalLabelingCanvas|PyQgsPalLabelingServer|PyQgsSymbolLayerV2|qgis_atlascompositiontest|PyQgsAtlasComposition' -S ../qgis-test-travis.ctest --output-on-failure
diff --git a/qgis-test-travis.ctest b/qgis-test-travis.ctest
new file mode 100644
index 00000000000..f2e10a9b9d5
--- /dev/null
+++ b/qgis-test-travis.ctest
@@ -0,0 +1,36 @@
+SET (CTEST_SOURCE_DIRECTORY $ENV{TRAVIS_BUILD_DIR})
+SET (CTEST_BINARY_DIRECTORY "$ENV{TRAVIS_BUILD_DIR}/build")
+#SET (CTEST_SOURCE_DIRECTORY /usr/src/QGIS)
+#SET (CTEST_BINARY_DIRECTORY /usr/src/qgis-build)
+
+SET( CTEST_CMAKE_GENERATOR  "Unix Makefiles" )
+SET (CTEST_CMAKE_COMMAND "cmake" )
+SET (CTEST_BUILD_COMMAND "/usr/bin/make -j2 -i -k" )
+SET (CTEST_SITE "travis-ci.org" )
+IF ($ENV{TRAVIS_PULL_REQUEST} STREQUAL "false")
+  # No pull request
+  SET (CTEST_BUILD_NAME "$ENV{TRAVIS_BRANCH} ($ENV{TRAVIS_COMMIT})")
+ELSE()
+  SET (CTEST_BUILD_NAME "PR: $ENV{TRAVIS_PULL_REQUEST} / $ENV{TRAVIS_BRANCH} ($ENV{TRAVIS_COMMIT})")
+ENDIF()
+SET (CTEST_BUILD_CONFIGURATION "Release")
+
+
+SET (INITIAL_CACHE "
+BUILDNAME:STRING=${CTEST_BUILD_NAME}
+SITE:STRING=${CTEST_SITE}
+CTEST_USE_LAUNCHERS:BOOL=ON
+")
+
+SET (CTEST_NOTES_FILES
+${CTEST_SCRIPT_DIRECTORY}/${CTEST_SCRIPT_NAME}
+${CTEST_BINARY_DIRECTORY}/CMakeCache.txt
+)
+
+# Requires a track on the CDash server
+#ctest_start(Experimental TRACK Travis)
+ctest_start(Experimental)
+ctest_build (BUILD "${CTEST_BINARY_DIRECTORY}")
+ctest_test (BUILD "${CTEST_BINARY_DIRECTORY}" PARALLEL_LEVEL 2)
+ctest_submit ()
+