Browse Source

For Travis CI - revert back call to make test pending investigation.

Yao Wei Tjong 姚伟忠 12 years ago
parent
commit
0fb12e5883
2 changed files with 2 additions and 2 deletions
  1. 1 1
      .travis.yml
  2. 1 1
      Source/Tools/Urho3DPlayer/CMakeLists.txt

+ 1 - 1
.travis.yml

@@ -4,7 +4,7 @@ before_install:
     - sudo add-apt-repository ppa:george-edison55/precise-backports -y
     - sudo add-apt-repository ppa:george-edison55/precise-backports -y
     - sudo apt-get update -q -y
     - sudo apt-get update -q -y
     - sudo apt-get install -q -y libx11-dev libxrandr-dev libasound2-dev libgl1-mesa-dev doxygen graphviz
     - sudo apt-get install -q -y libx11-dev libxrandr-dev libasound2-dev libgl1-mesa-dev doxygen graphviz
-script: ./cmake_gcc.sh -DURHO3D_LIB_TYPE=$TEST_LIB_TYPE -DENABLE_64BIT=1 -DENABLE_LUAJIT=1 -DENABLE_LUAJIT_AMALG=1 -DENABLE_SAMPLES=1 -DENABLE_TOOLS=1 -DENABLE_EXTRAS=1 -DENABLE_TESTING=1 && cd Build && make && make test
+script: ./cmake_gcc.sh -DURHO3D_LIB_TYPE=$TEST_LIB_TYPE -DENABLE_64BIT=1 -DENABLE_LUAJIT=1 -DENABLE_LUAJIT_AMALG=1 -DENABLE_SAMPLES=1 -DENABLE_TOOLS=1 -DENABLE_EXTRAS=1 && cd Build && make
 after_success: rake travis
 after_success: rake travis
 env:
 env:
   global:
   global:

+ 1 - 1
Source/Tools/Urho3DPlayer/CMakeLists.txt

@@ -32,4 +32,4 @@ setup_main_executable ()
 # Setup test cases
 # Setup test cases
 add_test (NAME Editor COMMAND ${TARGET_NAME} Data/Scripts/Editor.as -w -timeout ${TEST_TIME_OUT})
 add_test (NAME Editor COMMAND ${TARGET_NAME} Data/Scripts/Editor.as -w -timeout ${TEST_TIME_OUT})
 add_test (NAME AngelSprites COMMAND ${TARGET_NAME} Data/Scripts/03_Sprites.as -w -timeout ${TEST_TIME_OUT})
 add_test (NAME AngelSprites COMMAND ${TARGET_NAME} Data/Scripts/03_Sprites.as -w -timeout ${TEST_TIME_OUT})
-add_test (NAME LuaSprites COMMAND ${TARGET_NAME} Data/LuaScripts/03_Sprites.lua -w -timeout ${TEST_TIME_OUT})
+add_test (NAME LuaSprites COMMAND ${TARGET_NAME} Data/LuaScripts/03_Sprites.lua -w -timeout ${TEST_TIME_OUT})