From 5d421b46def136caa082ff30ff67ad6381657a31 Mon Sep 17 00:00:00 2001 From: Marc-Andre Laperle Date: Wed, 21 Oct 2015 17:25:47 -0400 Subject: [PATCH] ctf: Fix ExperimentBenchmark use of tracecompass-test-traces The way it was used, it was trying to parse the root of the experiment as a CTF trace. Change-Id: If575a1ef26a9de56c99bcea21fc5e12ae38e0131 Signed-off-by: Marc-Andre Laperle Reviewed-on: https://git.eclipse.org/r/58673 Reviewed-by: Hudson CI Reviewed-by: Matthew Khouzam Tested-by: Matthew Khouzam --- .../tests/perf/experiment/ExperimentBenchmark.java | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/ctf/org.eclipse.tracecompass.tmf.ctf.core.tests/perf/org/eclipse/tracecompass/tmf/ctf/core/tests/perf/experiment/ExperimentBenchmark.java b/ctf/org.eclipse.tracecompass.tmf.ctf.core.tests/perf/org/eclipse/tracecompass/tmf/ctf/core/tests/perf/experiment/ExperimentBenchmark.java index e4fbe64349..e8ae3e6593 100644 --- a/ctf/org.eclipse.tracecompass.tmf.ctf.core.tests/perf/org/eclipse/tracecompass/tmf/ctf/core/tests/perf/experiment/ExperimentBenchmark.java +++ b/ctf/org.eclipse.tracecompass.tmf.ctf.core.tests/perf/org/eclipse/tracecompass/tmf/ctf/core/tests/perf/experiment/ExperimentBenchmark.java @@ -14,11 +14,13 @@ package org.eclipse.tracecompass.tmf.ctf.core.tests.perf.experiment; import java.io.File; +import java.io.IOException; import java.util.Arrays; import java.util.HashSet; import java.util.List; import java.util.Set; +import org.eclipse.core.runtime.FileLocator; import org.eclipse.test.performance.Dimension; import org.eclipse.test.performance.Performance; import org.eclipse.test.performance.PerformanceMeter; @@ -29,7 +31,6 @@ import org.eclipse.tracecompass.tmf.core.request.ITmfEventRequest; import org.eclipse.tracecompass.tmf.core.request.ITmfEventRequest.ExecutionType; import org.eclipse.tracecompass.tmf.core.request.TmfEventRequest; import org.eclipse.tracecompass.tmf.core.trace.ITmfTrace; -import org.eclipse.tracecompass.tmf.ctf.core.tests.shared.CtfTmfTestTraceUtils; import org.eclipse.tracecompass.tmf.ctf.core.trace.CtfTmfTrace; import org.eclipse.tracecompass.tmf.tests.stubs.trace.TmfExperimentStub; import org.junit.Test; @@ -44,7 +45,14 @@ public class ExperimentBenchmark { private static final String TEST_ID = "org.eclipse.linuxtools#Experiment benchmark#"; private static final int MAX_TRACES = 160; private static final int BLOCK_SIZE = 100; - private static final String TRACES_ROOT_PATH = CtfTmfTestTraceUtils.getTrace(CtfTestTrace.TRACE_EXPERIMENT).getPath(); + private static final String TRACES_ROOT_PATH; + static { + try { + TRACES_ROOT_PATH = FileLocator.toFileURL(CtfTestTrace.TRACE_EXPERIMENT.getTraceURL()).getPath(); + } catch (IOException e) { + throw new IllegalStateException(); + } + } private static final int SAMPLE_SIZE_SLOW = 20; private static final int SAMPLE_SIZE = 100; -- 2.34.1