X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=org.eclipse.linuxtools.ctf.core.tests%2Fpom.xml;h=826951d841dee05a432713dd98a549b4abff55f0;hb=51c080159ed392e1a675754b6adeaa651a8ff864;hp=831d5a7a9a559d39d103ee9e16282a69f6f6d04a;hpb=2175e89d4517f55f79810eae7b07cf1e37112fdd;p=deliverable%2Ftracecompass.git

diff --git a/org.eclipse.linuxtools.ctf.core.tests/pom.xml b/org.eclipse.linuxtools.ctf.core.tests/pom.xml
index 831d5a7a9a..826951d841 100644
--- a/org.eclipse.linuxtools.ctf.core.tests/pom.xml
+++ b/org.eclipse.linuxtools.ctf.core.tests/pom.xml
@@ -16,7 +16,7 @@
   <parent>
     <artifactId>linuxtools-lttng-parent</artifactId>
     <groupId>org.eclipse.linuxtools.lttng</groupId>
-    <version>3.0.0-SNAPSHOT</version>
+    <version>3.1.0-SNAPSHOT</version>
   </parent>
 
   <name>Linux Tools CTF Core Tests Plug-in</name>
@@ -25,35 +25,43 @@
   <version>3.0.0-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
 
- <build>
-     <!-- workaround for https://issues.sonatype.org/browse/TYCHO-168 -->
-     <resources>
-      <resource>
-        <directory>src</directory>
-        <excludes>
-          <exclude>**/*.java</exclude>
-        </excludes>
-      </resource>
-    </resources>
+  <!-- Do not download the test traces if "maven.test.skip" is set -->
+  <profiles>
+    <profile>
+      <id>download-traces</id>
+      <activation>
+        <property>
+          <name>!maven.test.skip</name>
+        </property>
+      </activation>
+
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-antrun-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>prepare</id>
+                <phase>pre-integration-test</phase>
+                <configuration>
+                  <target>
+                    <ant antfile="get-traces.xml" dir="traces" />
+                  </target>
+                </configuration>
+                <goals>
+                  <goal>run</goal>
+                </goals>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
+
+  <build>
     <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-antrun-plugin</artifactId>
-          <executions>
-            <execution>
-              <id>prepare</id>
-              <phase>validate</phase>
-              <configuration>
-                <target>
-                 <ant antfile="get-traces.xml" dir="traces" />
-                </target>
-              </configuration>
-              <goals>
-                <goal>run</goal>
-              </goals>
-            </execution>
-          </executions>
-        </plugin>
       <plugin>
         <groupId>org.eclipse.tycho</groupId>
         <artifactId>tycho-surefire-plugin</artifactId>
@@ -67,6 +75,7 @@
           <product>org.eclipse.platform.ide</product>
         </configuration>
       </plugin>
+
       <!-- We don't use the ant file to clean because of http://jira.codehaus.org/browse/MANTRUN-78 -->
       <plugin>
         <artifactId>maven-clean-plugin</artifactId>
@@ -89,11 +98,15 @@
                 </fileset>
                 <fileset><directory>traces/ctf-testsuite</directory></fileset>
                 <fileset><directory>traces/cyg-profile</directory></fileset>
+                <fileset><directory>traces/django-benchmark</directory></fileset>
+                <fileset><directory>traces/funky_trace</directory></fileset>
                 <fileset><directory>traces/hello-lost</directory></fileset>
                 <fileset><directory>traces/kernel</directory></fileset>
                 <fileset><directory>traces/kernel_vm</directory></fileset>
                 <fileset><directory>traces/synctraces</directory></fileset>
+                <fileset><directory>traces/synthetic-trace</directory></fileset>
                 <fileset><directory>traces/trace2</directory></fileset>
+                <fileset><directory>traces/exp</directory></fileset>
               </filesets>
             </configuration>
             <goals>