summaryrefslogtreecommitdiffstatsabout
diff options
context:
space:
mode:
authorCamilo Bernal2013-04-29 15:53:03 (EDT)
committer Alexander Kurtakov2013-04-29 16:21:30 (EDT)
commite252684d28aa69772e6e25af850c561375652ed7 (patch)
tree36196822ec4e97a8cbe37765f113d7d2c8d39912
parent73a5b9de297d04db42bf5950269f28e69e34b612 (diff)
downloadorg.eclipse.linuxtools-e252684d28aa69772e6e25af850c561375652ed7.zip
org.eclipse.linuxtools-e252684d28aa69772e6e25af850c561375652ed7.tar.gz
org.eclipse.linuxtools-e252684d28aa69772e6e25af850c561375652ed7.tar.bz2
Oprofile: Remove o.e.l.oprofile.*.runOprofile flags from pom.xmlrefs/changes/56/12356/4
Tests are properly mocked and do not require functionality from the oprofile tools or kerndel module. Change-Id: I4835692f022ed0a4bb93eb4855e2bd22f6c01566 Reviewed-on: https://git.eclipse.org/r/12356 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.java15
-rw-r--r--oprofile/org.eclipse.linuxtools.oprofile.launch.tests/src/org/eclipse/linuxtools/oprofile/launch/tests/AllLaunchTests.java26
-rw-r--r--pom.xml2
3 files changed, 8 insertions, 35 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 f2d2616..f72a1ea 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
@@ -16,26 +16,13 @@ import junit.framework.TestSuite;
public class AllCoreTests {
public static Test suite() {
-
- /**
- * Java system properties.
- * 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.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$
-
- if (RUN_OPROFILE) {
+
suite.addTestSuite(TestModelDataParse.class);
suite.addTestSuite(TestSessionsParse.class);
suite.addTestSuite(TestCheckEventsParse.class);
suite.addTestSuite(TestInfoParse.class);
suite.addTestSuite(TestDataModel.class);
- }
-
suite.addTestSuite(TestDummy.class);
return suite;
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 1a04184..2451ff7 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
@@ -14,30 +14,16 @@ import junit.framework.Test;
import junit.framework.TestSuite;
public class AllLaunchTests {
-
-
public static Test suite() {
- /**
- * Java system properties.
- * 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.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$
-
- if (RUN_OPROFILE) {
- suite.addTestSuite(TestLaunching.class);
- suite.addTestSuite(TestManualLaunching.class);
- suite.addTestSuite(TestSetup.class);
- suite.addTestSuite(TestLaunchingExternalProject.class);
- }
-
+
+ suite.addTestSuite(TestLaunching.class);
+ suite.addTestSuite(TestManualLaunching.class);
+ suite.addTestSuite(TestSetup.class);
+ suite.addTestSuite(TestLaunchingExternalProject.class);
suite.addTestSuite(TestDummy.class);
-
+
return suite;
}
-
}
diff --git a/pom.xml b/pom.xml
index e499c23..4526a2d 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.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.perf.tests.runPerf=no -Dorg.eclipse.swt.browser.UseWebKitGTK=true</argLine>
</configuration>
</plugin>
</plugins>