Jelajahi Sumber

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 tahun lalu
induk
melakukan
67ce3e48bd
2 mengubah file dengan 5 tambahan dan 5 penghapusan
  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 ()
         endif ()
         list (APPEND ARG_OPTIONS -timeout ${URHO3D_TEST_TIMEOUT})
         list (APPEND ARG_OPTIONS -timeout ${URHO3D_TEST_TIMEOUT})
         if (EMSCRIPTEN)
         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})
             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 ()
         else ()
             add_test (NAME ${ARG_NAME} COMMAND ${TARGET_NAME} ${ARG_OPTIONS})
             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)
     add_subdirectory (ThirdParty/Recast)
 endif ()
 endif ()
 
 
-if (URHO3D_PHYSICS)
-    add_subdirectory (ThirdParty/Bullet)
-endif ()
-
 if (URHO3D_URHO2D)
 if (URHO3D_URHO2D)
     add_subdirectory (ThirdParty/Box2D)
     add_subdirectory (ThirdParty/Box2D)
 endif ()
 endif ()
 
 
+if (URHO3D_PHYSICS)
+    add_subdirectory (ThirdParty/Bullet)
+endif ()
+
 if (NOT IOS AND NOT ANDROID AND NOT RPI AND NOT EMSCRIPTEN)
 if (NOT IOS AND NOT ANDROID AND NOT RPI AND NOT EMSCRIPTEN)
     if (URHO3D_OPENGL)
     if (URHO3D_OPENGL)
         add_subdirectory (ThirdParty/GLEW)
         add_subdirectory (ThirdParty/GLEW)