summaryrefslogtreecommitdiffstatsabout
diff options
context:
space:
mode:
authorCamilo Bernal2013-04-29 17:16:34 (EDT)
committer Alexander Kurtakov2013-04-30 02:52:53 (EDT)
commitaae102f60cf1d64f5071a9bbea5ddb4fa9af8276 (patch)
treea7fed911ab7ee783342ff9fee34e50a84a8ed5cd
parentfb573b0faf4a0e6291832df8384c1096300c50dc (diff)
downloadorg.eclipse.linuxtools-aae102f60cf1d64f5071a9bbea5ddb4fa9af8276.zip
org.eclipse.linuxtools-aae102f60cf1d64f5071a9bbea5ddb4fa9af8276.tar.gz
org.eclipse.linuxtools-aae102f60cf1d64f5071a9bbea5ddb4fa9af8276.tar.bz2
Perf: Remove o.e.l.perf.tests.runPerf maven flag from parent pom.xmlrefs/changes/66/12366/3
This flag is only used in a single test, which already checks if the perf tool is installed before running. Change-Id: I980af50a90a165ee3f0ea3092d12292bfd11e9d9 Reviewed-on: https://git.eclipse.org/r/12366 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--perf/org.eclipse.linuxtools.perf.tests/src/org/eclipse/linuxtools/internal/perf/tests/AllPerfTests.java17
-rw-r--r--pom.xml2
2 files changed, 3 insertions, 16 deletions
diff --git a/perf/org.eclipse.linuxtools.perf.tests/src/org/eclipse/linuxtools/internal/perf/tests/AllPerfTests.java b/perf/org.eclipse.linuxtools.perf.tests/src/org/eclipse/linuxtools/internal/perf/tests/AllPerfTests.java
index a879cd1..5a9c9ed 100644
--- a/perf/org.eclipse.linuxtools.perf.tests/src/org/eclipse/linuxtools/internal/perf/tests/AllPerfTests.java
+++ b/perf/org.eclipse.linuxtools.perf.tests/src/org/eclipse/linuxtools/internal/perf/tests/AllPerfTests.java
@@ -16,27 +16,14 @@ import junit.framework.TestSuite;
public class AllPerfTests {
public static Test suite() {
- /**
- * Java system properties. usage:
- * -Dorg.eclipse.linuxtools.perf.tests.runPerf=<yes|no>
- * [default: yes] if yes, will run the launch tests no, will skip the
- * launch tests (they all require perf to be installed)
- */
- String SYSTEM_PROPERTY_RUN_PERF = "org.eclipse.linuxtools.perf.tests.runPerf"; //$NON-NLS-1$
- boolean RUN_PERF = System
- .getProperty(SYSTEM_PROPERTY_RUN_PERF, "yes").equals("yes"); //$NON-NLS-1$ //$NON-NLS-2$
- TestSuite suite = new TestSuite(
- "Test for org.eclipse.linuxtools.perf.tests"); //$NON-NLS-1$
+ TestSuite suite = new TestSuite("Test for org.eclipse.linuxtools.perf.tests"); //$NON-NLS-1$
suite.addTestSuite(LaunchTabsTest.class);
suite.addTestSuite(ModelTest.class);
suite.addTestSuite(DataManipulatorTest.class);
suite.addTestSuite(SaveSessionTest.class);
suite.addTestSuite(StatsComparisonTest.class);
-
- if (RUN_PERF) {
- suite.addTestSuite(LaunchTest.class);
- }
+ suite.addTestSuite(LaunchTest.class);
return suite;
}
diff --git a/pom.xml b/pom.xml
index 4526a2d..4df9d9a 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.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.swt.browser.UseWebKitGTK=true</argLine>
</configuration>
</plugin>
</plugins>