Skip to main content
aboutsummaryrefslogtreecommitdiffstats
path: root/gcov
diff options
context:
space:
mode:
authorXavier Raynaud2012-03-14 16:11:33 +0000
committerXavier Raynaud2012-03-14 16:11:33 +0000
commit4366feabe572a461b23acbffe7c6f6c16b09bfd0 (patch)
treefc9eab4a2d051b4213e3be82f28937a5117cea16 /gcov
parent91979509025c86777ddddd0f3548fd473733f237 (diff)
downloadorg.eclipse.linuxtools-4366feabe572a461b23acbffe7c6f6c16b09bfd0.tar.gz
org.eclipse.linuxtools-4366feabe572a461b23acbffe7c6f6c16b09bfd0.tar.xz
org.eclipse.linuxtools-4366feabe572a461b23acbffe7c6f6c16b09bfd0.zip
yet another attemps to fix gcov test in hudson
Diffstat (limited to 'gcov')
-rw-r--r--gcov/org.eclipse.linuxtools.gcov.test/src/org/eclipse/linuxtools/internal/gcov/test/GcovTestC.java11
-rw-r--r--gcov/org.eclipse.linuxtools.gcov.test/src/org/eclipse/linuxtools/internal/gcov/test/GcovTestCLibrary.java11
-rw-r--r--gcov/org.eclipse.linuxtools.gcov.test/src/org/eclipse/linuxtools/internal/gcov/test/GcovTestCPP.java11
3 files changed, 21 insertions, 12 deletions
diff --git a/gcov/org.eclipse.linuxtools.gcov.test/src/org/eclipse/linuxtools/internal/gcov/test/GcovTestC.java b/gcov/org.eclipse.linuxtools.gcov.test/src/org/eclipse/linuxtools/internal/gcov/test/GcovTestC.java
index 6a97ad3f56..0a67f6e627 100644
--- a/gcov/org.eclipse.linuxtools.gcov.test/src/org/eclipse/linuxtools/internal/gcov/test/GcovTestC.java
+++ b/gcov/org.eclipse.linuxtools.gcov.test/src/org/eclipse/linuxtools/internal/gcov/test/GcovTestC.java
@@ -42,10 +42,13 @@ public class GcovTestC {
}
bot.perspectiveByLabel("C/C++").activate();
- bot.sleep(1000);
- if (bot.getFinder().activeShell() == null) {
- bot.shells()[0].activate();
- bot.sleep(1000);
+ bot.sleep(500);
+ for (SWTBotShell sh : bot.shells()) {
+ if (sh.getText().startsWith("C/C++")) {
+ sh.activate();
+ bot.sleep(500);
+ break;
+ }
}
bot.captureScreenshot(PROJECT_NAME + ".beforeClass.2.jpg");
// Turn off automatic building by default
diff --git a/gcov/org.eclipse.linuxtools.gcov.test/src/org/eclipse/linuxtools/internal/gcov/test/GcovTestCLibrary.java b/gcov/org.eclipse.linuxtools.gcov.test/src/org/eclipse/linuxtools/internal/gcov/test/GcovTestCLibrary.java
index bf56cbe0e4..34497fa764 100644
--- a/gcov/org.eclipse.linuxtools.gcov.test/src/org/eclipse/linuxtools/internal/gcov/test/GcovTestCLibrary.java
+++ b/gcov/org.eclipse.linuxtools.gcov.test/src/org/eclipse/linuxtools/internal/gcov/test/GcovTestCLibrary.java
@@ -43,10 +43,13 @@ public class GcovTestCLibrary {
}
bot.perspectiveByLabel("C/C++").activate();
- bot.sleep(1000);
- if (bot.getFinder().activeShell() == null) {
- bot.shells()[0].activate();
- bot.sleep(1000);
+ bot.sleep(500);
+ for (SWTBotShell sh : bot.shells()) {
+ if (sh.getText().startsWith("C/C++")) {
+ sh.activate();
+ bot.sleep(500);
+ break;
+ }
}
bot.captureScreenshot(PROJECT_NAME + ".beforeClass.2.jpg");
// Turn off automatic building by default
diff --git a/gcov/org.eclipse.linuxtools.gcov.test/src/org/eclipse/linuxtools/internal/gcov/test/GcovTestCPP.java b/gcov/org.eclipse.linuxtools.gcov.test/src/org/eclipse/linuxtools/internal/gcov/test/GcovTestCPP.java
index a9b0bede83..7e364153a5 100644
--- a/gcov/org.eclipse.linuxtools.gcov.test/src/org/eclipse/linuxtools/internal/gcov/test/GcovTestCPP.java
+++ b/gcov/org.eclipse.linuxtools.gcov.test/src/org/eclipse/linuxtools/internal/gcov/test/GcovTestCPP.java
@@ -42,10 +42,13 @@ public class GcovTestCPP {
}
bot.perspectiveByLabel("C/C++").activate();
- bot.sleep(1000);
- if (bot.getFinder().activeShell() == null) {
- bot.shells()[0].activate();
- bot.sleep(1000);
+ bot.sleep(500);
+ for (SWTBotShell sh : bot.shells()) {
+ if (sh.getText().startsWith("C/C++")) {
+ sh.activate();
+ bot.sleep(500);
+ break;
+ }
}
bot.captureScreenshot(PROJECT_NAME + ".beforeClass.2.jpg");
// Turn off automatic building by default

Back to the top