Skip to content

Commit 1b35877

Browse files
Fabio Gaibaintellij-monorepo-bot
authored andcommitted
[clion][ui-test] CPP-47923 fix: series of problems happening on CI/CD images
- cygwin gdb and cmake path - ordering of Toolchains in Windows - too short timeout and waiting on Docker textfields. In docker toolchain, the textfields are not expandable, so they must be grabbed in a slightly different manner. GitOrigin-RevId: 9d74e863f930ce6d10fbfc913e33e5077fc8082b
1 parent ddccfa1 commit 1b35877

2 files changed

Lines changed: 8 additions & 1 deletion

File tree

platform/remote-driver/test-sdk/src/com/intellij/driver/sdk/ui/components/clion/Toolchain.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ enum class Debugger {
152152
CUSTOM_GDB {
153153
override fun getDebuggerPath(): String = when (OS.CURRENT) {
154154
// Windows will use cygwin gdbserver executable as the custom gdb server
155-
OS.Windows -> "C:/cygwin64/bin/gdbserver.exe"
155+
OS.Windows -> "C:/Tools/cygwin/bin/gdbserver.exe"
156156
else -> "/usr/bin/gdb"
157157
}
158158
override fun getDebuggerFieldName(): String = "Custom GDB executable"

platform/remote-driver/test-sdk/src/com/intellij/driver/sdk/ui/components/clion/ToolchainPanel.kt

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,13 @@ class ToolchainPanel(data: ComponentData) : SettingsDialogUiComponent(data) {
7676
}
7777
}
7878

79+
fun ToolchainPanel.setupCMake(cmakePath: String) {
80+
getToolchainField("CMake").click()
81+
keyboard { key(KeyEvent.VK_DOWN) }
82+
getToolchainField("CMake").text = cmakePath
83+
keyboard { enter() }
84+
}
85+
7986
fun ToolchainPanel.setupRemoteHost(host: String, username: String, port: String, password: String) {
8087
actionButtonByXpath(xQuery { byClass("FixedSizeButton") }).click()
8188
driver.ui.dialog(xQuery { byTitle("SSH Configurations") }) {

0 commit comments

Comments
 (0)