aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRodrigo Fraxino Araujo2014-05-21 04:30:09 (EDT)
committerRoland Grunberg2014-05-29 11:18:26 (EDT)
commitc078835a962664ea82bb55c6c55eaeda72f9ddd7 (patch)
treeee0952d8ea93b0c36b154b4d2de063aab3f19f4d
parentfb11f71f14f30d69c97e9792dae47137f37f8db9 (diff)
downloadorg.eclipse.linuxtools-c078835a962664ea82bb55c6c55eaeda72f9ddd7.zip
org.eclipse.linuxtools-c078835a962664ea82bb55c6c55eaeda72f9ddd7.tar.gz
org.eclipse.linuxtools-c078835a962664ea82bb55c6c55eaeda72f9ddd7.tar.bz2
perf: remove deprecated -f optionrefs/changes/75/26975/3
Fix for bugzilla #434533 Change-Id: Ibf0ebf2615c2b1cb1f7b704c994f01941f05ac1f Reviewed-on: https://git.eclipse.org/r/26975 Tested-by: Hudson CI Reviewed-by: Roland Grunberg <rgrunber@redhat.com>
-rw-r--r--perf/org.eclipse.linuxtools.perf.tests/src/org/eclipse/linuxtools/internal/perf/tests/ModelTest.java2
-rw-r--r--perf/org.eclipse.linuxtools.perf/src/org/eclipse/linuxtools/internal/perf/PerfCore.java4
2 files changed, 1 insertions, 5 deletions
diff --git a/perf/org.eclipse.linuxtools.perf.tests/src/org/eclipse/linuxtools/internal/perf/tests/ModelTest.java b/perf/org.eclipse.linuxtools.perf.tests/src/org/eclipse/linuxtools/internal/perf/tests/ModelTest.java
index 8e4c691..269731e 100644
--- a/perf/org.eclipse.linuxtools.perf.tests/src/org/eclipse/linuxtools/internal/perf/tests/ModelTest.java
+++ b/perf/org.eclipse.linuxtools.perf.tests/src/org/eclipse/linuxtools/internal/perf/tests/ModelTest.java
@@ -349,7 +349,7 @@ public class ModelTest extends AbstractTest {
String[] recordString = PerfCore.getRecordString(tempConfig, new Version(0, 0, 0));
assertNotNull(recordString);
- String[] expectedString = { PerfPlugin.PERF_COMMAND, "record", "-f",
+ String[] expectedString = { PerfPlugin.PERF_COMMAND, "record",
"-r", "2", "-v", "-M", "-e", "cpu-cycles", "-e", "cache-misses",
"-e", "cpu-clock" };
assertArrayEquals(expectedString, recordString);
diff --git a/perf/org.eclipse.linuxtools.perf/src/org/eclipse/linuxtools/internal/perf/PerfCore.java b/perf/org.eclipse.linuxtools.perf/src/org/eclipse/linuxtools/internal/perf/PerfCore.java
index 35fa602..1f0d2b7 100644
--- a/perf/org.eclipse.linuxtools.perf/src/org/eclipse/linuxtools/internal/perf/PerfCore.java
+++ b/perf/org.eclipse.linuxtools.perf/src/org/eclipse/linuxtools/internal/perf/PerfCore.java
@@ -250,10 +250,6 @@ public class PerfCore {
ArrayList<String> newCommand = new ArrayList<>();
newCommand.addAll(Arrays.asList(base));
try {
- if (new Version(3, 11, 0).compareTo(perfVersion) > 0) {
- // Removed as of 4a4d371a4dfbd3b84a7eab8d535d4c7c3647b09e from perf upstream (kernel)
- newCommand.add("-f"); //$NON-NLS-1$
- }
if (config.getAttribute(PerfPlugin.ATTR_Record_Realtime, PerfPlugin.ATTR_Record_Realtime_default)) {
newCommand.add("-r"); //$NON-NLS-1$
int priority = config.getAttribute(PerfPlugin.ATTR_Record_Realtime_Priority, PerfPlugin.ATTR_Record_Realtime_Priority_default);