Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeneviève Bastien2014-08-11 19:17:02 +0000
committerGenevieve Bastien2014-08-12 21:23:00 +0000
commit4cba2e36d93973f73a4148ccc074272bc0b6947e (patch)
tree02876bcacc58a75092d5990c8bc86a3c7dcbf2eb
parentb5decf943d435188ed875ffd5397a32cff25d8a9 (diff)
downloadorg.eclipse.linuxtools-4cba2e36d93973f73a4148ccc074272bc0b6947e.tar.gz
org.eclipse.linuxtools-4cba2e36d93973f73a4148ccc074272bc0b6947e.tar.xz
org.eclipse.linuxtools-4cba2e36d93973f73a4148ccc074272bc0b6947e.zip
TMF: Remove the @Ignore from some performance tests
Change-Id: I6b2124d5d13b6e80feb5d97757e796c3e2a98552 Signed-off-by: Geneviève Bastien <gbastien+lttng@versatic.net> Reviewed-on: https://git.eclipse.org/r/31399 Tested-by: Hudson CI Reviewed-by: Alexandre Montplaisir <alexmonthy@voxpopuli.im>
-rw-r--r--lttng/org.eclipse.linuxtools.lttng2.kernel.core.tests/perf/org/eclipse/linuxtools/lttng2/kernel/core/tests/perf/event/matching/EventMatchingBenchmark.java5
-rw-r--r--lttng/org.eclipse.linuxtools.lttng2.kernel.core.tests/perf/org/eclipse/linuxtools/lttng2/kernel/core/tests/perf/event/matching/TraceSynchronizationBenchmark.java5
2 files changed, 0 insertions, 10 deletions
diff --git a/lttng/org.eclipse.linuxtools.lttng2.kernel.core.tests/perf/org/eclipse/linuxtools/lttng2/kernel/core/tests/perf/event/matching/EventMatchingBenchmark.java b/lttng/org.eclipse.linuxtools.lttng2.kernel.core.tests/perf/org/eclipse/linuxtools/lttng2/kernel/core/tests/perf/event/matching/EventMatchingBenchmark.java
index c19669141c..b71194cca3 100644
--- a/lttng/org.eclipse.linuxtools.lttng2.kernel.core.tests/perf/org/eclipse/linuxtools/lttng2/kernel/core/tests/perf/event/matching/EventMatchingBenchmark.java
+++ b/lttng/org.eclipse.linuxtools.lttng2.kernel.core.tests/perf/org/eclipse/linuxtools/lttng2/kernel/core/tests/perf/event/matching/EventMatchingBenchmark.java
@@ -27,7 +27,6 @@ import org.eclipse.test.performance.Dimension;
import org.eclipse.test.performance.Performance;
import org.eclipse.test.performance.PerformanceMeter;
import org.junit.BeforeClass;
-import org.junit.Ignore;
import org.junit.Test;
import com.google.common.collect.ImmutableSet;
@@ -69,11 +68,7 @@ public class EventMatchingBenchmark {
/**
* Run the benchmark with 3 bigger traces
- *
- * TODO: For now, this test takes a lot of RAM. To run, remove the @Ignore
- * and set at least 1024Mb RAM, or else there is OutOfMemoryError exception
*/
- @Ignore
@Test
public void testDjangoTraces() {
assumeTrue(CtfTmfTestTrace.DJANGO_CLIENT.exists());
diff --git a/lttng/org.eclipse.linuxtools.lttng2.kernel.core.tests/perf/org/eclipse/linuxtools/lttng2/kernel/core/tests/perf/event/matching/TraceSynchronizationBenchmark.java b/lttng/org.eclipse.linuxtools.lttng2.kernel.core.tests/perf/org/eclipse/linuxtools/lttng2/kernel/core/tests/perf/event/matching/TraceSynchronizationBenchmark.java
index 968ccb8da4..f4ab323eb6 100644
--- a/lttng/org.eclipse.linuxtools.lttng2.kernel.core.tests/perf/org/eclipse/linuxtools/lttng2/kernel/core/tests/perf/event/matching/TraceSynchronizationBenchmark.java
+++ b/lttng/org.eclipse.linuxtools.lttng2.kernel.core.tests/perf/org/eclipse/linuxtools/lttng2/kernel/core/tests/perf/event/matching/TraceSynchronizationBenchmark.java
@@ -29,7 +29,6 @@ import org.eclipse.test.performance.Dimension;
import org.eclipse.test.performance.Performance;
import org.eclipse.test.performance.PerformanceMeter;
import org.junit.BeforeClass;
-import org.junit.Ignore;
import org.junit.Test;
/**
@@ -69,11 +68,7 @@ public class TraceSynchronizationBenchmark {
/**
* Run the benchmark with 3 bigger traces
- *
- * TODO: For now, this test takes a lot of RAM. To run, remove the @Ignore
- * and set at least 1024Mb RAM, or else there is OutOfMemoryError exception
*/
- @Ignore
@Test
public void testDjangoTraces() {
assumeTrue(CtfTmfTestTrace.DJANGO_CLIENT.exists());

Back to the top