Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeneviève Bastien2018-05-30 13:08:22 -0400
committerGenevieve Bastien2018-05-31 09:48:24 -0400
commitd22b5cf11f828270f4d1f9f86cc56607d5e4bd94 (patch)
tree69af07f01551644b7d5743f3ba32c1ec94a91b0f
parente642cee3d686713f12c2f97c74936c7bc3eb602a (diff)
downloadorg.eclipse.tracecompass.incubator-d22b5cf11f828270f4d1f9f86cc56607d5e4bd94.tar.gz
org.eclipse.tracecompass.incubator-d22b5cf11f828270f4d1f9f86cc56607d5e4bd94.tar.xz
org.eclipse.tracecompass.incubator-d22b5cf11f828270f4d1f9f86cc56607d5e4bd94.zip
analysis.tests: wait for TidAnalysisModule in some tests
There was build instability in AnalysisthreadNameAspectTest and AnalysisProcessNameAspectTest as it only waited for the KernelAnalysisModule to be completed before doing the test, but it also needs the TidAnalysisModule data. Change-Id: Ie3ef19f6b26b4f23261c463ccdb8cb85d8980e28 Signed-off-by: Geneviève Bastien <gbastien+lttng@versatic.net> Reviewed-on: https://git.eclipse.org/r/123670 Tested-by: CI Bot Reviewed-by: Matthew Khouzam <matthew.khouzam@ericsson.com>
-rw-r--r--callstack/org.eclipse.tracecompass.incubator.analysis.core.tests/src/org/eclipse/tracecompass/incubator/analysis/core/tests/aspects/AnalysisProcessNameAspectTest.java13
-rw-r--r--callstack/org.eclipse.tracecompass.incubator.analysis.core.tests/src/org/eclipse/tracecompass/incubator/analysis/core/tests/aspects/AnalysisThreadNameAspectTest.java13
2 files changed, 18 insertions, 8 deletions
diff --git a/callstack/org.eclipse.tracecompass.incubator.analysis.core.tests/src/org/eclipse/tracecompass/incubator/analysis/core/tests/aspects/AnalysisProcessNameAspectTest.java b/callstack/org.eclipse.tracecompass.incubator.analysis.core.tests/src/org/eclipse/tracecompass/incubator/analysis/core/tests/aspects/AnalysisProcessNameAspectTest.java
index 204f4401..cf786518 100644
--- a/callstack/org.eclipse.tracecompass.incubator.analysis.core.tests/src/org/eclipse/tracecompass/incubator/analysis/core/tests/aspects/AnalysisProcessNameAspectTest.java
+++ b/callstack/org.eclipse.tracecompass.incubator.analysis.core.tests/src/org/eclipse/tracecompass/incubator/analysis/core/tests/aspects/AnalysisProcessNameAspectTest.java
@@ -19,6 +19,7 @@ import org.eclipse.jdt.annotation.NonNull;
import org.eclipse.jdt.annotation.Nullable;
import org.eclipse.tracecompass.analysis.os.linux.core.event.aspect.LinuxPidAspect;
import org.eclipse.tracecompass.analysis.os.linux.core.kernel.KernelAnalysisModule;
+import org.eclipse.tracecompass.analysis.os.linux.core.tid.TidAnalysisModule;
import org.eclipse.tracecompass.incubator.analysis.core.aspects.AnalysisProcessNameAspect;
import org.eclipse.tracecompass.incubator.analysis.core.model.IHostModel;
import org.eclipse.tracecompass.incubator.analysis.core.model.ModelManager;
@@ -72,10 +73,14 @@ public class AnalysisProcessNameAspectTest {
public void setUp() {
LttngKernelTrace trace = LttngKernelTestTraceUtils.getTrace(TRACE);
trace.traceOpened(new TmfTraceOpenedSignal(this, trace, null));
- IAnalysisModule kernelModule = trace.getAnalysisModule(KernelAnalysisModule.ID);
- assertNotNull(kernelModule);
- kernelModule.schedule();
- assertTrue(kernelModule.waitForCompletion());
+ IAnalysisModule module = trace.getAnalysisModule(KernelAnalysisModule.ID);
+ assertNotNull(module);
+ module.schedule();
+ assertTrue(module.waitForCompletion());
+ module = trace.getAnalysisModule(TidAnalysisModule.ID);
+ assertNotNull(module);
+ module.schedule();
+ assertTrue(module.waitForCompletion());
fTrace = trace;
}
diff --git a/callstack/org.eclipse.tracecompass.incubator.analysis.core.tests/src/org/eclipse/tracecompass/incubator/analysis/core/tests/aspects/AnalysisThreadNameAspectTest.java b/callstack/org.eclipse.tracecompass.incubator.analysis.core.tests/src/org/eclipse/tracecompass/incubator/analysis/core/tests/aspects/AnalysisThreadNameAspectTest.java
index 29c4133f..2d7a6b00 100644
--- a/callstack/org.eclipse.tracecompass.incubator.analysis.core.tests/src/org/eclipse/tracecompass/incubator/analysis/core/tests/aspects/AnalysisThreadNameAspectTest.java
+++ b/callstack/org.eclipse.tracecompass.incubator.analysis.core.tests/src/org/eclipse/tracecompass/incubator/analysis/core/tests/aspects/AnalysisThreadNameAspectTest.java
@@ -19,6 +19,7 @@ import org.eclipse.jdt.annotation.NonNull;
import org.eclipse.jdt.annotation.Nullable;
import org.eclipse.tracecompass.analysis.os.linux.core.event.aspect.LinuxTidAspect;
import org.eclipse.tracecompass.analysis.os.linux.core.kernel.KernelAnalysisModule;
+import org.eclipse.tracecompass.analysis.os.linux.core.tid.TidAnalysisModule;
import org.eclipse.tracecompass.incubator.analysis.core.aspects.AnalysisThreadNameAspect;
import org.eclipse.tracecompass.incubator.analysis.core.model.IHostModel;
import org.eclipse.tracecompass.incubator.analysis.core.model.ModelManager;
@@ -71,10 +72,14 @@ public class AnalysisThreadNameAspectTest {
public void setUp() {
LttngKernelTrace trace = LttngKernelTestTraceUtils.getTrace(TRACE);
trace.traceOpened(new TmfTraceOpenedSignal(this, trace, null));
- IAnalysisModule kernelModule = trace.getAnalysisModule(KernelAnalysisModule.ID);
- assertNotNull(kernelModule);
- kernelModule.schedule();
- assertTrue(kernelModule.waitForCompletion());
+ IAnalysisModule module = trace.getAnalysisModule(KernelAnalysisModule.ID);
+ assertNotNull(module);
+ module.schedule();
+ assertTrue(module.waitForCompletion());
+ module = trace.getAnalysisModule(TidAnalysisModule.ID);
+ assertNotNull(module);
+ module.schedule();
+ assertTrue(module.waitForCompletion());
fTrace = trace;
}

Back to the top