# HG changeset patch
# User sheepluva <sheepluva@users.noreply.github.com>
# Date 1417192698 -3600
# Node ID 247e36ba28149069ae1283b6d52fec4b3af56210
# Parent  dbbd92f0b1dda20d4be283004c1c65fcb8c947ae# Parent  8b65886906f39d5f7c109f53b2aec1d770c5cc50
Merge pull request #20 from LocutusOfBorg/tests

pull request merge: add testsuite, exclude pas2c build from testing for now

diff -r dbbd92f0b1dd -r 247e36ba2814 .travis.yml
--- a/.travis.yml	Thu Nov 27 22:06:51 2014 +0100
+++ b/.travis.yml	Fri Nov 28 17:38:18 2014 +0100
@@ -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 dbbd92f0b1dd -r 247e36ba2814 CMakeLists.txt
--- a/CMakeLists.txt	Thu Nov 27 22:06:51 2014 +0100
+++ b/CMakeLists.txt	Fri Nov 28 17:38:18 2014 +0100
@@ -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")