diff options
Diffstat (limited to 'coin/instructions/call_cmake_for_standalone_tests.yaml')
-rw-r--r-- | coin/instructions/call_cmake_for_standalone_tests.yaml | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/coin/instructions/call_cmake_for_standalone_tests.yaml b/coin/instructions/call_cmake_for_standalone_tests.yaml index 7ab936cf87..9b7b9ad141 100644 --- a/coin/instructions/call_cmake_for_standalone_tests.yaml +++ b/coin/instructions/call_cmake_for_standalone_tests.yaml @@ -1,18 +1,6 @@ type: Group instructions: - type: ChangeDirectory - directory: "{{.SourceDir}}" - - type: ExecuteCommand - command: "{{.SourceDir}}/util/android/android_cmakelist_patcher.sh" - maxTimeInSeconds: 6000 - maxTimeBetweenOutput: 1200 - userMessageOnFailure: > - Failed to patch CMakeLists.txt. - enable_if: - condition: property - property: features - contains_value: AndroidTestRun - - type: ChangeDirectory directory: "{{.BuildDir}}" - type: ExecuteCommand command: "{{.Env.TESTS_ENV_PREFIX}} {{.Env.INSTALL_DIR_FOR_CMAKE_TESTS}}\\bin\\qt-internal-configure-tests {{.Env.COIN_CMAKE_ARGS}}" @@ -26,7 +14,7 @@ instructions: property: host.os equals_value: Windows - type: ExecuteCommand - command: "{{.Env.TESTS_ENV_PREFIX}} {{.Env.INSTALL_DIR_FOR_CMAKE_TESTS}}/bin/qt-internal-configure-tests {{.Env.COIN_CMAKE_ARGS}}" + command: "{{.Env.TESTS_ENV_PREFIX}} {{.Env.INSTALL_DIR_FOR_CMAKE_TESTS}}/libexec/qt-internal-configure-tests {{.Env.COIN_CMAKE_ARGS}}" executeCommandArgumentSplitingBehavior: SplitAfterVariableSubstitution maxTimeInSeconds: 6000 maxTimeBetweenOutput: 1200 |