瀏覽代碼

Increase the multiplier for the EMRUN time out setting.
Emscripten has just released version 1.30 which, among others, fixes the EMRUN time out handling. In the previous version it did not time-out as expected. But now as EMRUN times out correctly, the build test failed on our Emscripten build due to Travis CI latency.

Yao Wei Tjong 姚伟忠 10 年之前
父節點
當前提交
67ce3e48bd
共有 2 個文件被更改,包括 5 次插入5 次删除
  1. 1 1
      CMake/Modules/Urho3D-CMake-common.cmake
  2. 4 4
      Source/CMakeLists.txt

+ 1 - 1
CMake/Modules/Urho3D-CMake-common.cmake

@@ -1127,7 +1127,7 @@ macro (setup_test)
         endif ()
         list (APPEND ARG_OPTIONS -timeout ${URHO3D_TEST_TIMEOUT})
         if (EMSCRIPTEN)
-            math (EXPR EMRUN_TIMEOUT "2 * ${URHO3D_TEST_TIMEOUT}")
+            math (EXPR EMRUN_TIMEOUT "5 * ${URHO3D_TEST_TIMEOUT}")
             add_test (NAME ${ARG_NAME} COMMAND ${EMRUN} --browser ${EMSCRIPTEN_EMRUN_BROWSER} --timeout ${EMRUN_TIMEOUT} --timeout_returncode 1 --kill_exit ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${TARGET_NAME}.html ${ARG_OPTIONS})
         else ()
             add_test (NAME ${ARG_NAME} COMMAND ${TARGET_NAME} ${ARG_OPTIONS})

+ 4 - 4
Source/CMakeLists.txt

@@ -74,14 +74,14 @@ if (URHO3D_NAVIGATION)
     add_subdirectory (ThirdParty/Recast)
 endif ()
 
-if (URHO3D_PHYSICS)
-    add_subdirectory (ThirdParty/Bullet)
-endif ()
-
 if (URHO3D_URHO2D)
     add_subdirectory (ThirdParty/Box2D)
 endif ()
 
+if (URHO3D_PHYSICS)
+    add_subdirectory (ThirdParty/Bullet)
+endif ()
+
 if (NOT IOS AND NOT ANDROID AND NOT RPI AND NOT EMSCRIPTEN)
     if (URHO3D_OPENGL)
         add_subdirectory (ThirdParty/GLEW)