summaryrefslogtreecommitdiffstatsabout
diff options
context:
space:
mode:
authorCamilo Bernal2013-04-29 11:56:42 (EDT)
committer Alexander Kurtakov2013-04-29 12:23:00 (EDT)
commit3b2524ce605e0a747c29c5b0e73d6b088096ad95 (patch)
tree9aa2a22d85ce8db49100660ce71f926214e2c4af
parent809cf1e519931badbba3eabf8eb982ec1c3446cf (diff)
downloadorg.eclipse.linuxtools-3b2524ce605e0a747c29c5b0e73d6b088096ad95.zip
org.eclipse.linuxtools-3b2524ce605e0a747c29c5b0e73d6b088096ad95.tar.gz
org.eclipse.linuxtools-3b2524ce605e0a747c29c5b0e73d6b088096ad95.tar.bz2
Bug 393593: Combine flags for running the oprofile binary dependent testsrefs/changes/50/12350/2
Change-Id: I771b873493af74504642db018711e441d1699ef5 Reviewed-on: https://git.eclipse.org/r/12350 Tested-by: Hudson CI Reviewed-by: Alexander Kurtakov <akurtako@redhat.com> IP-Clean: Alexander Kurtakov <akurtako@redhat.com> Tested-by: Alexander Kurtakov <akurtako@redhat.com>
-rw-r--r--oprofile/org.eclipse.linuxtools.oprofile.core.tests/src/org/eclipse/linuxtools/oprofile/core/tests/AllCoreTests.java4
-rw-r--r--oprofile/org.eclipse.linuxtools.oprofile.launch.tests/src/org/eclipse/linuxtools/oprofile/launch/tests/AllLaunchTests.java4
-rw-r--r--pom.xml2
3 files changed, 5 insertions, 5 deletions
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.core.tests/src/org/eclipse/linuxtools/oprofile/core/tests/AllCoreTests.java b/oprofile/org.eclipse.linuxtools.oprofile.core.tests/src/org/eclipse/linuxtools/oprofile/core/tests/AllCoreTests.java
index c90185e..f2d2616 100644
--- a/oprofile/org.eclipse.linuxtools.oprofile.core.tests/src/org/eclipse/linuxtools/oprofile/core/tests/AllCoreTests.java
+++ b/oprofile/org.eclipse.linuxtools.oprofile.core.tests/src/org/eclipse/linuxtools/oprofile/core/tests/AllCoreTests.java
@@ -19,11 +19,11 @@ public class AllCoreTests {
/**
* Java system properties.
- * usage: -Dorg.eclipse.linuxtools.oprofile.core.tests.runOprofile=<yes|no> [default: yes]
+ * usage: -Dorg.eclipse.linuxtools.oprofile.tests.runOprofile=<yes|no> [default: yes]
* if yes, will run the core tests
* no, will skip the core tests (they all require oOProfile to be set up)
*/
- String SYSTEM_PROPERTY_RUN_OPROFILE = "org.eclipse.linuxtools.oprofile.core.tests.runOprofile"; //$NON-NLS-1$
+ String SYSTEM_PROPERTY_RUN_OPROFILE = "org.eclipse.linuxtools.oprofile.tests.runOprofile"; //$NON-NLS-1$
boolean RUN_OPROFILE = System.getProperty(SYSTEM_PROPERTY_RUN_OPROFILE, "yes").equals("yes"); //$NON-NLS-1$ //$NON-NLS-2$
TestSuite suite = new TestSuite("Test for org.eclipse.linuxtools.oprofile.core.tests"); //$NON-NLS-1$
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.launch.tests/src/org/eclipse/linuxtools/oprofile/launch/tests/AllLaunchTests.java b/oprofile/org.eclipse.linuxtools.oprofile.launch.tests/src/org/eclipse/linuxtools/oprofile/launch/tests/AllLaunchTests.java
index 6d93f8e..1a04184 100644
--- a/oprofile/org.eclipse.linuxtools.oprofile.launch.tests/src/org/eclipse/linuxtools/oprofile/launch/tests/AllLaunchTests.java
+++ b/oprofile/org.eclipse.linuxtools.oprofile.launch.tests/src/org/eclipse/linuxtools/oprofile/launch/tests/AllLaunchTests.java
@@ -20,11 +20,11 @@ public class AllLaunchTests {
public static Test suite() {
/**
* Java system properties.
- * usage: -Dorg.eclipse.linuxtools.oprofile.launch.tests.runOprofile=<yes|no> [default: yes]
+ * usage: -Dorg.eclipse.linuxtools.oprofile.tests.runOprofile=<yes|no> [default: yes]
* if yes, will run the launch tests
* no, will skip the launch tests (they all require oprofile to be set up)
*/
- String SYSTEM_PROPERTY_RUN_OPROFILE = "org.eclipse.linuxtools.oprofile.launch.tests.runOprofile"; //$NON-NLS-1$
+ String SYSTEM_PROPERTY_RUN_OPROFILE = "org.eclipse.linuxtools.oprofile.tests.runOprofile"; //$NON-NLS-1$
boolean RUN_OPROFILE = System.getProperty(SYSTEM_PROPERTY_RUN_OPROFILE, "yes").equals("yes"); //$NON-NLS-1$ //$NON-NLS-2$
TestSuite suite = new TestSuite("Test for org.eclipse.linuxtools.oprofile.launch.tests"); //$NON-NLS-1$
diff --git a/pom.xml b/pom.xml
index 5e095e6..e499c23 100644
--- a/pom.xml
+++ b/pom.xml
@@ -154,7 +154,7 @@
</dependency>
</dependencies>
<product>org.eclipse.sdk.ide</product>
- <argLine>-Xms512m -Xmx1024m -XX:PermSize=256m -XX:MaxPermSize=256m -Declipse.valgrind.tests.runValgrind=no -Dorg.eclipse.linuxtools.oprofile.launch.tests.runOprofile=no -Dorg.eclipse.linuxtools.oprofile.core.tests.runOprofile=no -Dorg.eclipse.linuxtools.perf.tests.runPerf=no -Dorg.eclipse.swt.browser.UseWebKitGTK=true</argLine>
+ <argLine>-Xms512m -Xmx1024m -XX:PermSize=256m -XX:MaxPermSize=256m -Declipse.valgrind.tests.runValgrind=no -Dorg.eclipse.linuxtools.oprofile.tests.runOprofile=no -Dorg.eclipse.linuxtools.perf.tests.runPerf=no -Dorg.eclipse.swt.browser.UseWebKitGTK=true</argLine>
</configuration>
</plugin>
</plugins>