diff options
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 f2d2616fc6..f72a1ea99a 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 1a04184036..2451ff7225 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; } - } @@ -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> |