summaryrefslogtreecommitdiffstatsabout
diff options
context:
space:
mode:
authorCamilo Bernal2013-01-09 14:28:13 (EST)
committer Roland Grunberg2013-01-09 15:05:37 (EST)
commit938a1f6e8e2fc063ebdc5114c70bda53346987d1 (patch)
tree081735a3d65e65c54fd60936a27245a78df4b455
parentb341bd59ed80f4e848039acc6477ce5711318841 (diff)
downloadorg.eclipse.linuxtools-938a1f6e8e2fc063ebdc5114c70bda53346987d1.zip
org.eclipse.linuxtools-938a1f6e8e2fc063ebdc5114c70bda53346987d1.tar.gz
org.eclipse.linuxtools-938a1f6e8e2fc063ebdc5114c70bda53346987d1.tar.bz2
Skip opcontrol status check in oprofile launch tests.refs/changes/65/9565/2
Oprofile launch tests override the launch delegate to avoid executing opcontrol functionality. Method OprofileStatus can be overwritten to return true as the test results do not depend on opcontrol. Change-Id: I7cf8898e7385f1554ab488759de26661d4fc9886 Reviewed-on: https://git.eclipse.org/r/9565 Tested-by: Hudson CI Reviewed-by: Roland Grunberg <rgrunber@redhat.com> IP-Clean: Roland Grunberg <rgrunber@redhat.com> Tested-by: Roland Grunberg <rgrunber@redhat.com>
-rw-r--r--oprofile/org.eclipse.linuxtools.oprofile.launch.tests/src/org/eclipse/linuxtools/oprofile/launch/tests/TestManualLaunching.java2
-rw-r--r--oprofile/org.eclipse.linuxtools.oprofile.launch.tests/src/org/eclipse/linuxtools/oprofile/launch/tests/utils/TestingOprofileLaunchConfigurationDelegate.java2
2 files changed, 4 insertions, 0 deletions
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.launch.tests/src/org/eclipse/linuxtools/oprofile/launch/tests/TestManualLaunching.java b/oprofile/org.eclipse.linuxtools.oprofile.launch.tests/src/org/eclipse/linuxtools/oprofile/launch/tests/TestManualLaunching.java
index 3625345..2083510 100644
--- a/oprofile/org.eclipse.linuxtools.oprofile.launch.tests/src/org/eclipse/linuxtools/oprofile/launch/tests/TestManualLaunching.java
+++ b/oprofile/org.eclipse.linuxtools.oprofile.launch.tests/src/org/eclipse/linuxtools/oprofile/launch/tests/TestManualLaunching.java
@@ -44,6 +44,8 @@ public class TestManualLaunching extends AbstractTest {
@Override
protected void oprofileStartCollection() { return; }
@Override
+ protected boolean oprofileStatus() { return true; }
+ @Override
protected void oprofileSetupDaemon(OprofileDaemonOptions options, OprofileDaemonEvent[] events) {
_options = options;
eventsIsNull = events == null ? true : false;
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.launch.tests/src/org/eclipse/linuxtools/oprofile/launch/tests/utils/TestingOprofileLaunchConfigurationDelegate.java b/oprofile/org.eclipse.linuxtools.oprofile.launch.tests/src/org/eclipse/linuxtools/oprofile/launch/tests/utils/TestingOprofileLaunchConfigurationDelegate.java
index 486055f..96ef7b9 100644
--- a/oprofile/org.eclipse.linuxtools.oprofile.launch.tests/src/org/eclipse/linuxtools/oprofile/launch/tests/utils/TestingOprofileLaunchConfigurationDelegate.java
+++ b/oprofile/org.eclipse.linuxtools.oprofile.launch.tests/src/org/eclipse/linuxtools/oprofile/launch/tests/utils/TestingOprofileLaunchConfigurationDelegate.java
@@ -33,6 +33,8 @@ public final class TestingOprofileLaunchConfigurationDelegate extends OprofileLa
@Override
protected void oprofileShutdown() { return; }
@Override
+ protected boolean oprofileStatus() { return true; }
+ @Override
protected void oprofileStartCollection() { return; }
@Override
protected void oprofileSetupDaemon(OprofileDaemonOptions options, OprofileDaemonEvent[] events) {