# HG changeset patch
# User nemo
# Date 1417271975 18000
# Node ID a960f529d4bccba1b6122a1c83ba167a80a66fb0
# Parent  b574f04c9685f6c48d77794b7fdb62f87a795398# Parent  9744ca2764d63c8afb83b209d4fd875658dabd62
merge

diff -r b574f04c9685 -r a960f529d4bc .travis.yml
--- a/.travis.yml	Fri Nov 28 21:30:36 2014 -0500
+++ b/.travis.yml	Sat Nov 29 09:39:35 2014 -0500
@@ -25,7 +25,7 @@
   - sudo apt-get update -qq
   - sudo apt-get install debhelper cmake dpkg-dev libqt4-dev qt4-qmake libphysfs-dev libsdl1.2-dev libsdl-ttf2.0-dev libsdl-mixer1.2-dev libsdl-image1.2-dev libsdl-net1.2-dev bzip2 ghc libghc-mtl-dev libghc-parsec3-dev libghc-bytestring-show-dev libghc-vector-dev libghc-zlib-dev libghc-random-dev libghc-stm-dev libghc-network-dev libghc-dataenc-dev libghc-hslogger-dev libghc-utf8-string-dev libghc-sha-dev libghc-entropy-dev liblua5.1-0-dev imagemagick fpc fp-compiler fp-units-misc libpng-dev fp-units-gfx libavcodec-dev libavformat-dev freeglut3-dev libglew1.6-dev
 script: 
-  - mkdir build && cd build && cmake $BUILD_ARGS .. && make VERBOSE=1
+  - mkdir build && cd build && cmake $BUILD_ARGS .. && make VERBOSE=1 && make test_verbose
 notifications:
   irc:
     channels:
diff -r b574f04c9685 -r a960f529d4bc CMakeLists.txt
--- a/CMakeLists.txt	Fri Nov 28 21:30:36 2014 -0500
+++ b/CMakeLists.txt	Sat Nov 29 09:39:35 2014 -0500
@@ -230,7 +230,11 @@
 
 include(${CMAKE_MODULE_PATH}/cpackvars.cmake)
 
+if(NOT BUILD_ENGINE_C)
 enable_testing()
+endif(NOT BUILD_ENGINE_C)
+add_custom_target(test         COMMAND ${CMAKE_CTEST_COMMAND} -E '^todo/' --timeout 300 --schedule-random)
+add_custom_target(test_verbose COMMAND ${CMAKE_CTEST_COMMAND} -E '^todo/' --timeout 300 --schedule-random -V)
 
 set(LUATESTS_DIR "${CMAKE_SOURCE_DIR}/tests/lua")
 set(TESTSDATA_DIR "${CMAKE_SOURCE_DIR}/share/hedgewars/Data")
diff -r b574f04c9685 -r a960f529d4bc cmake_modules/cpackvars.cmake
--- a/cmake_modules/cpackvars.cmake	Fri Nov 28 21:30:36 2014 -0500
+++ b/cmake_modules/cpackvars.cmake	Sat Nov 29 09:39:35 2014 -0500
@@ -35,6 +35,7 @@
     ".swp"
     #version control
     "\\\\.hg"
+    "\\\\.git"
     "\\\\.orig$"
     #output binary/library
     "\\\\.exe$"