diff options
| author | Jeff Johnston | 2018-10-03 21:35:01 +0000 |
|---|---|---|
| committer | Jeff Johnston | 2018-10-03 22:16:02 +0000 |
| commit | ceb44294ad659e54b73b6902d43387b05b206f5b (patch) | |
| tree | 1e2d44f880e95611e90a8ad17246a6013e6f77fc | |
| parent | 0b73bea05a4c477bc6bde78f7f23ac2a8c693a20 (diff) | |
| download | org.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
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 85611aec87b..17a0658de92 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 37682e5b366..9581b3f52e8 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 4d3c759893b..1f4d33643ba 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; } |