diff options
| author | John Arthorne | 2011-08-25 18:37:15 +0000 |
|---|---|---|
| committer | John Arthorne | 2011-08-25 18:37:15 +0000 |
| commit | 62c1e04e060abd9e60bd732f24553a4fe77a1961 (patch) | |
| tree | 6748a3ebf539e8ab045c901fd93ac5fea45366f8 | |
| parent | b6ece334babdb7c8373e8e213e3a79d79f282a32 (diff) | |
| parent | e14b0598ca6a0d5a721e959caf5a6384918714ef (diff) | |
| download | eclipse.platform.runtime-johntestaug25.tar.gz eclipse.platform.runtime-johntestaug25.tar.xz eclipse.platform.runtime-johntestaug25.zip | |
Merge branch 'master' into johntestaug25johntestaug25
Conflicts:
tests/org.eclipse.core.tests.harness/src/org/eclipse/core/tests/harness/FileSystemHelper.java
3 files changed, 3 insertions, 1 deletions
diff --git a/tests/org.eclipse.core.tests.harness/src/org/eclipse/core/tests/harness/FileSystemHelper.java b/tests/org.eclipse.core.tests.harness/src/org/eclipse/core/tests/harness/FileSystemHelper.java index eb7bab714..70bde6d37 100644 --- a/tests/org.eclipse.core.tests.harness/src/org/eclipse/core/tests/harness/FileSystemHelper.java +++ b/tests/org.eclipse.core.tests.harness/src/org/eclipse/core/tests/harness/FileSystemHelper.java @@ -15,7 +15,7 @@ import org.eclipse.core.runtime.*; /** * Home for file system-related utility methods. - * change in johntestaug25 branch + * Change in master */ public class FileSystemHelper { /** counter for generating unique random file system locations */ diff --git a/tests/org.eclipse.core.tests.harness/src/org/eclipse/core/tests/harness/FussyProgressMonitor.java b/tests/org.eclipse.core.tests.harness/src/org/eclipse/core/tests/harness/FussyProgressMonitor.java index dac032e95..0104795f6 100644 --- a/tests/org.eclipse.core.tests.harness/src/org/eclipse/core/tests/harness/FussyProgressMonitor.java +++ b/tests/org.eclipse.core.tests.harness/src/org/eclipse/core/tests/harness/FussyProgressMonitor.java @@ -21,6 +21,8 @@ import org.eclipse.core.runtime.jobs.Job; * invocation. * Call sanityCheck() after the operation whose progress monitoring * you are testing. + * + * another change */ public class FussyProgressMonitor extends TestProgressMonitor { public class FussyProgressAssertionFailed extends AssertionFailedError { diff --git a/tests/org.eclipse.e4.core.tests/test.xml b/tests/org.eclipse.e4.core.tests/test.xml index 470bf01b4..470bf01b4 100755..100644 --- a/tests/org.eclipse.e4.core.tests/test.xml +++ b/tests/org.eclipse.e4.core.tests/test.xml |