Fix left-over merge conflicts

No matter how many F5's, Eclipse won't report any error until AFTER
you pushed it to the repo. Of course.

Change-Id: I67e1c090c74f323c275b3f1226ecf4777b23a0c2
Signed-off-by: Alexandre Montplaisir <alexmonthy@voxpopuli.im>

diff --git a/org.eclipse.linuxtools.ctf.core.tests/shared/org/eclipse/linuxtools/ctf/core/tests/shared/CtfTestTrace.java b/org.eclipse.linuxtools.ctf.core.tests/shared/org/eclipse/linuxtools/ctf/core/tests/shared/CtfTestTrace.java
index a09912ffb1f510215e81dc85cd67a04dec33620d..28c511c2634b64b590754956bec458dedf753575 100644 (file)
--- a/org.eclipse.linuxtools.ctf.core.tests/shared/org/eclipse/linuxtools/ctf/core/tests/shared/CtfTestTrace.java
+++ b/org.eclipse.linuxtools.ctf.core.tests/shared/org/eclipse/linuxtools/ctf/core/tests/shared/CtfTestTrace.java
@@ -34,7 +34,7 @@ public enum CtfTestTrace {
     /** Trace synchronization: source trace */
     SYNC_SRC("../org.eclipse.linuxtools.ctf.core.tests/traces/synctraces/scp_src"),
     /** Trace synchronization: destination trace */
-    SYNC_DEST("../org.eclipse.linuxtools.ctf.core.tests/traces/synctraces/scp_dest");
+    SYNC_DEST("../org.eclipse.linuxtools.ctf.core.tests/traces/synctraces/scp_dest"),
     /** UST trace with lots of lost events */
     HELLO_LOST("../org.eclipse.linuxtools.ctf.core.tests/traces/hello-lost");
 

diff --git a/org.eclipse.linuxtools.ctf.core.tests/traces/.gitignore b/org.eclipse.linuxtools.ctf.core.tests/traces/.gitignore
index 2161368bc9d0789df4491dc81d29b0e086dd367e..3678d68c2fe24c2a31f81e6969809f071d4a6553 100644 (file)
--- a/org.eclipse.linuxtools.ctf.core.tests/traces/.gitignore
+++ b/org.eclipse.linuxtools.ctf.core.tests/traces/.gitignore
@@ -1,10 +1,11 @@
 *.bz2
+*.gz
 *.tar
+*.ht
 /ctf-testsuite
 /hello-lost
 /kernel
 /kernel_vm
 /synctraces
 /trace2
-*.ht
 

diff --git a/org.eclipse.linuxtools.tmf.core.tests/shared/org/eclipse/linuxtools/tmf/core/tests/shared/CtfTmfTestTrace.java b/org.eclipse.linuxtools.tmf.core.tests/shared/org/eclipse/linuxtools/tmf/core/tests/shared/CtfTmfTestTrace.java
index 9427119468b196bc89ec251bf9d7c5ed8254c1ad..8465394d60868a497f09a9d037cd0d3ffee0d19f 100644 (file)
--- a/org.eclipse.linuxtools.tmf.core.tests/shared/org/eclipse/linuxtools/tmf/core/tests/shared/CtfTmfTestTrace.java
+++ b/org.eclipse.linuxtools.tmf.core.tests/shared/org/eclipse/linuxtools/tmf/core/tests/shared/CtfTmfTestTrace.java
@@ -35,7 +35,7 @@ public enum CtfTmfTestTrace {
     /** Trace synchronization: source trace */
     SYNC_SRC,
     /** Trace synchronization: destination trace */
-    SYNC_DEST;
+    SYNC_DEST,
     /** UST trace with lots of lost events */
     HELLO_LOST;
 

diff --git a/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/ctfadaptor/CtfTmfLostEventsTest.java b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/ctfadaptor/CtfTmfLostEventsTest.java
index 9b3cf742eb4e3dfa3cb7e41e8e37477afa4e27f7..dc1f50827c8a50cc9485c2ab3641835a21fc8a92 100644 (file)
--- a/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/ctfadaptor/CtfTmfLostEventsTest.java
+++ b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/ctfadaptor/CtfTmfLostEventsTest.java
@@ -192,7 +192,7 @@ public class CtfTmfLostEventsTest {
         private CtfTmfEvent event = null;
 
         public OneEventRequestPerRank(long rank) {
-            super(CtfTmfEvent.class, TmfTimeRange.ETERNITY, rank, 1, 1, ExecutionType.FOREGROUND);
+            super(CtfTmfEvent.class, TmfTimeRange.ETERNITY, rank, 1, ExecutionType.FOREGROUND);
         }
 
         @Override
@@ -213,7 +213,7 @@ public class CtfTmfLostEventsTest {
         public OneEventRequestPerTs(ITmfTimestamp ts) {
             super(CtfTmfEvent.class,
                     new TmfTimeRange(ts, TmfTimestamp.PROJECT_IS_CANNED),
-                    0, 1, 1, ExecutionType.FOREGROUND);
+                    0, 1, ExecutionType.FOREGROUND);
         }
 
         @Override
@@ -233,7 +233,7 @@ public class CtfTmfLostEventsTest {
 
         public EventCountRequest() {
             super(CtfTmfEvent.class, TmfTimeRange.ETERNITY, 0,
-                    TmfDataRequest.ALL_DATA, 1, ExecutionType.FOREGROUND);
+                    TmfDataRequest.ALL_DATA, ExecutionType.FOREGROUND);
         }
 
         @Override