diff options
Diffstat (limited to 'coin')
3 files changed, 1 insertions, 23 deletions
diff --git a/coin/instructions/call_cmake_for_standalone_tests.yaml b/coin/instructions/call_cmake_for_standalone_tests.yaml index cdbec9f107..7b78eee8c8 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: "{{.InstallDir}}/libexec/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}}" diff --git a/coin/instructions/cmake_regular_test_instructions_common.yaml b/coin/instructions/cmake_regular_test_instructions_common.yaml index 3a9e75c576..ec6f23a3f7 100644 --- a/coin/instructions/cmake_regular_test_instructions_common.yaml +++ b/coin/instructions/cmake_regular_test_instructions_common.yaml @@ -11,13 +11,3 @@ instructions: Failed to install tests archive. - type: ChangeDirectory directory: "{{.SourceDir}}_standalone_tests" - - type: ExecuteCommand - command: "ln -s {{.InstallDir}}/target fake_prefix" - maxTimeInSeconds: 6000 - maxTimeBetweenOutput: 1200 - userMessageOnFailure: > - Failed to run android hack. See QTBUG-88579 to check if this can be removed - enable_if: - condition: property - property: features - contains_value: AndroidTestRun diff --git a/coin/instructions/coin_module_test_android_start_emulator.yaml b/coin/instructions/coin_module_test_android_start_emulator.yaml index 57023b3a1f..448a9ca9af 100644 --- a/coin/instructions/coin_module_test_android_start_emulator.yaml +++ b/coin/instructions/coin_module_test_android_start_emulator.yaml @@ -3,7 +3,7 @@ instructions: - type: Group instructions: - type: ExecuteCommand - command: "sh {{.InstallDir}}/libexec/android_emulator_launcher.sh" + command: "{{.InstallDir}}/libexec/android_emulator_launcher.sh" maxTimeInSeconds: 300 maxTimeBetweenOutput: 300 userMessageOnFailure: "Failed to start emulator, check logs." |