Merge branch 'master' into lttng-luna

Signed-off-by: Alexandre Montplaisir <alexmonthy@voxpopuli.im>
Conflicts:
	lttng/org.eclipse.linuxtools.ctf.core.tests/shared/org/eclipse/linuxtools/ctf/core/tests/shared/CtfTestTrace.java
	lttng/org.eclipse.linuxtools.ctf.core.tests/traces/get-traces.xml
	lttng/org.eclipse.linuxtools.tmf.core.tests/shared/org/eclipse/linuxtools/tmf/core/tests/shared/CtfTmfTestTrace.java

Change-Id: I4fa50b717809ea2cf7cc92e2a0addb159f6b9cc2

diff --cc org.eclipse.linuxtools.ctf.core.tests/pom.xml
Simple merge

diff --cc org.eclipse.linuxtools.ctf.core.tests/shared/org/eclipse/linuxtools/ctf/core/tests/shared/CtfTestTrace.java
index b45b6fcd3958000dc483925f470853e0f592f222,e55ca29fbf9fc641a1054611c6ea630d7ecc4791..a09912ffb1f510215e81dc85cd67a04dec33620d
--- 1/org.eclipse.linuxtools.ctf.core.tests/shared/org/eclipse/linuxtools/ctf/core/tests/shared/CtfTestTrace.java
--- 2/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
@@@ -31,10 -31,8 +31,12 @@@ public enum CtfTestTrace 
      TRACE2("../org.eclipse.linuxtools.ctf.core.tests/traces/trace2"),
      /** Kernel trace with event contexts */
      KERNEL_VM("../org.eclipse.linuxtools.ctf.core.tests/traces/kernel_vm"),
 +    /** 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");
+     /** UST trace with lots of lost events */
+     HELLO_LOST("../org.eclipse.linuxtools.ctf.core.tests/traces/hello-lost");
  
  
      private final String fPath;

diff --cc org.eclipse.linuxtools.ctf.core.tests/traces/.gitignore
index 4194ab3cbe550654719796b76e1376721234de4e,e84b9285d4b98ee38e2ad5cd95625323e3235b90..2161368bc9d0789df4491dc81d29b0e086dd367e
--- 1/org.eclipse.linuxtools.ctf.core.tests/traces/.gitignore
--- 2/org.eclipse.linuxtools.ctf.core.tests/traces/.gitignore
+++ b/org.eclipse.linuxtools.ctf.core.tests/traces/.gitignore
@@@ -1,9 -1,9 +1,10 @@@
  *.bz2
  *.tar
  /ctf-testsuite
+ /hello-lost
  /kernel
  /kernel_vm
 +/synctraces
  /trace2
  *.ht
  

diff --cc org.eclipse.linuxtools.ctf.core.tests/traces/get-traces.sh
index 71ef35378d0bb4e17bed3068c8b862917dc422e7,eb2c221acfa4c9323a422e7866256bfc2b53d90b..66c4f1dd64212c92498da8411005cd0013acf0df
--- 1/org.eclipse.linuxtools.ctf.core.tests/traces/get-traces.sh
--- 2/org.eclipse.linuxtools.ctf.core.tests/traces/get-traces.sh
+++ b/org.eclipse.linuxtools.ctf.core.tests/traces/get-traces.sh
@@@ -22,9 -22,8 +22,12 @@@ wget http://www.dorsal.polymtl.ca/~alex
  # Trace using event contexts
  wget http://www.dorsal.polymtl.ca/~alexmont/data/kernel_vm.tar.bz2 -O- | tar xvjf - &&
  
+ # Trace with lost events
+ wget http://www.dorsal.polymtl.ca/~alexmont/data/hello-lost.tar.bz2 -O- | tar xvjf - &&
+ 
  # CTF test suite, used for testing CTF parser compliance
  git clone https://github.com/efficios/ctf-testsuite.git
 +
 +# Trace used by the lttng2 kernel to match packets and synchronize
 +wget http://www.dorsal.polymtl.ca/~gbastien/traces/synctraces.tar.gz -O- | tar xvzf - &&
 +

diff --cc org.eclipse.linuxtools.ctf.core.tests/traces/get-traces.xml
index b860ebaa8433199428147924af0b87fca60b9c33,02b40e7fe7333feac0345a8e77e78dfc407fca64..588be110cd48b660d698c6ee803886638c5ec658
--- 1/org.eclipse.linuxtools.ctf.core.tests/traces/get-traces.xml
--- 2/org.eclipse.linuxtools.ctf.core.tests/traces/get-traces.xml
+++ b/org.eclipse.linuxtools.ctf.core.tests/traces/get-traces.xml
@@@ -14,7 -14,7 +14,8 @@@
    <get ignoreerrors="true" dest="sample-ctf-trace-20120412.tar.bz2" skipexisting="true" src="http://lttng.org/files/samples/sample-ctf-trace-20120412.tar.bz2"/>
    <get ignoreerrors="true" dest="trace2.tar.bz2" skipexisting="true" src="http://www.dorsal.polymtl.ca/~alexmont/data/trace2.tar.bz2"/>
    <get ignoreerrors="true" dest="kernel_vm.tar.bz2" skipexisting="true" src="http://www.dorsal.polymtl.ca/~alexmont/data/kernel_vm.tar.bz2" />
 +  <get ignoreerrors="true" dest="synctraces.tar.gz" skipexisting="true" src="http://www.dorsal.polymtl.ca/~gbastien/traces/synctraces.tar.gz" />
+   <get ignoreerrors="true" dest="hello-lost.tar.bz2" skipexisting="true" src="http://www.dorsal.polymtl.ca/~alexmont/data/hello-lost.tar.bz2" />
    <exec executable = "git" failifexecutionfails="false">
      <arg value = "clone"/>
      <arg value = "https://github.com/efficios/ctf-testsuite.git"/>
@@@ -30,7 -30,7 +31,8 @@@
        <available file="sample-ctf-trace-20120412.tar.bz2"/>
        <available file="trace2.tar.bz2"/>
        <available file="kernel_vm.tar.bz2" />
 +      <available file="synctraces.tar.gz" />
+       <available file="hello-lost.tar.bz2" />
      </and>
    </condition>
    <antcall target="extractTraces"/>
@@@ -46,11 -46,11 +48,15 @@@
      <bunzip2 src="sample-ctf-trace-20120412.tar.bz2"/>
      <bunzip2 src="trace2.tar.bz2"/>
      <bunzip2 src="kernel_vm.tar.bz2" />
-       <gunzip src="synctraces.tar.gz" />
++    <gunzip src="synctraces.tar.gz" />
+     <bunzip2 src="hello-lost.tar.bz2" />
++    
      <untar src="sample-ctf-trace-20120412.tar" dest="." />
      <untar src="trace2.tar" dest="." />
      <untar src="kernel_vm.tar" dest="." />
-       <untar src="synctraces.tar" dest="." />
++    <untar src="synctraces.tar" dest="." />
+     <untar src="hello-lost.tar" dest="." />
++
      <echo message="Traces extracted successfully"/>
  </target>
  </project>

diff --cc org.eclipse.linuxtools.tmf.core.tests/shared/org/eclipse/linuxtools/tmf/core/tests/shared/CtfTmfTestTrace.java
index 6b47f88403b197dd6fa91e0281afefe9d4e9b21d,a745ecb0abefe2ad05dce5cbf357aa943c92e33f..9427119468b196bc89ec251bf9d7c5ed8254c1ad
--- 1/org.eclipse.linuxtools.tmf.core.tests/shared/org/eclipse/linuxtools/tmf/core/tests/shared/CtfTmfTestTrace.java
--- 2/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
@@@ -32,10 -32,8 +32,12 @@@ public enum CtfTmfTestTrace 
      TRACE2,
      /** Kernel trace with event contexts */
      KERNEL_VM,
 +    /** Trace synchronization: source trace */
 +    SYNC_SRC,
 +    /** Trace synchronization: destination trace */
 +    SYNC_DEST;
+     /** UST trace with lots of lost events */
+     HELLO_LOST;
  
  
      private final String fPath;