Skip to main content
summaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
authorJeff Johnston2018-10-03 17:35:01 -0400
committerJeff Johnston2018-10-03 18:16:02 -0400
commitceb44294ad659e54b73b6902d43387b05b206f5b (patch)
tree1e2d44f880e95611e90a8ad17246a6013e6f77fc /build
parent0b73bea05a4c477bc6bde78f7f23ac2a8c693a20 (diff)
downloadorg.eclipse.cdt-ceb44294ad659e54b73b6902d43387b05b206f5b.tar.gz
org.eclipse.cdt-ceb44294ad659e54b73b6902d43387b05b206f5b.tar.xz
org.eclipse.cdt-ceb44294ad659e54b73b6902d43387b05b206f5b.zip
Bug 535903 - buildMesonProject test is unstable
- fix previous fix to refresh the lines after each second of waiting for build to finish Change-Id: Ieb6e5d7885603c0e160ffe8bc19f4a30646620ab
Diffstat (limited to 'build')
-rw-r--r--build/org.eclipse.cdt.meson.ui.tests/src/org/eclipse/cdt/internal/meson/ui/tests/NewManualNinjaTest.java2
-rw-r--r--build/org.eclipse.cdt.meson.ui.tests/src/org/eclipse/cdt/internal/meson/ui/tests/NewMesonConfigureTest.java2
-rw-r--r--build/org.eclipse.cdt.meson.ui.tests/src/org/eclipse/cdt/internal/meson/ui/tests/NewMesonProjectTest.java2
3 files changed, 6 insertions, 0 deletions
diff --git a/build/org.eclipse.cdt.meson.ui.tests/src/org/eclipse/cdt/internal/meson/ui/tests/NewManualNinjaTest.java b/build/org.eclipse.cdt.meson.ui.tests/src/org/eclipse/cdt/internal/meson/ui/tests/NewManualNinjaTest.java
index 85611aec87..17a0658de9 100644
--- a/build/org.eclipse.cdt.meson.ui.tests/src/org/eclipse/cdt/internal/meson/ui/tests/NewManualNinjaTest.java
+++ b/build/org.eclipse.cdt.meson.ui.tests/src/org/eclipse/cdt/internal/meson/ui/tests/NewManualNinjaTest.java
@@ -192,6 +192,8 @@ public class NewManualNinjaTest {
int i = 0;
while (i < 10 && !lines[lines.length-1].startsWith("Build complete")) {
+ output = console.bot().styledText().getText();
+ lines = output.split("\\r?\\n"); //$NON-NLS-1$
bot.sleep(1000);
++i;
}
diff --git a/build/org.eclipse.cdt.meson.ui.tests/src/org/eclipse/cdt/internal/meson/ui/tests/NewMesonConfigureTest.java b/build/org.eclipse.cdt.meson.ui.tests/src/org/eclipse/cdt/internal/meson/ui/tests/NewMesonConfigureTest.java
index 37682e5b36..9581b3f52e 100644
--- a/build/org.eclipse.cdt.meson.ui.tests/src/org/eclipse/cdt/internal/meson/ui/tests/NewMesonConfigureTest.java
+++ b/build/org.eclipse.cdt.meson.ui.tests/src/org/eclipse/cdt/internal/meson/ui/tests/NewMesonConfigureTest.java
@@ -247,6 +247,8 @@ public class NewMesonConfigureTest {
int i = 0;
while (i < 10 && !lines[lines.length-1].startsWith("Build complete")) {
+ String output = console.bot().styledText().getText();
+ lines = output.split("\\r?\\n"); //$NON-NLS-1$
bot.sleep(1000);
++i;
}
diff --git a/build/org.eclipse.cdt.meson.ui.tests/src/org/eclipse/cdt/internal/meson/ui/tests/NewMesonProjectTest.java b/build/org.eclipse.cdt.meson.ui.tests/src/org/eclipse/cdt/internal/meson/ui/tests/NewMesonProjectTest.java
index 4d3c759893..1f4d33643b 100644
--- a/build/org.eclipse.cdt.meson.ui.tests/src/org/eclipse/cdt/internal/meson/ui/tests/NewMesonProjectTest.java
+++ b/build/org.eclipse.cdt.meson.ui.tests/src/org/eclipse/cdt/internal/meson/ui/tests/NewMesonProjectTest.java
@@ -187,6 +187,8 @@ public class NewMesonProjectTest {
int i = 0;
while (i < 10 && !lines[lines.length-1].startsWith("Build complete")) {
+ output = console.bot().styledText().getText();
+ lines = output.split("\\r?\\n"); //$NON-NLS-1$
bot.sleep(1000);
++i;
}

Back to the top