releng: Move the "performance" profile check inside the alltests plugin

Right now, the alltests/pom.xml is used solely to run the
performance" profile, which runs the performance tests.

We can move the "if" inside the alltests plugin itself, so
that this pom.xml can be used for other profiles.

Change-Id: I7b03b1d5b1064b66e28226676849939fe2ca6975
Signed-off-by: Alexandre Montplaisir <alexmonthy@voxpopuli.im>
Reviewed-on: https://git.eclipse.org/r/51760
Reviewed-by: Hudson CI
Reviewed-by: Marc-Andre Laperle <marc-andre.laperle@ericsson.com>
Tested-by: Marc-Andre Laperle <marc-andre.laperle@ericsson.com>

diff --git a/releng/org.eclipse.tracecompass.alltests/pom.xml b/releng/org.eclipse.tracecompass.alltests/pom.xml
index 868ad65a349a63ee348f90fdfd1d2a4e5fdff27b..ba354a54d091f44d9bd1307ca7b3933d65b4f7c8 100644 (file)
--- a/releng/org.eclipse.tracecompass.alltests/pom.xml
+++ b/releng/org.eclipse.tracecompass.alltests/pom.xml
@@ -34,67 +34,89 @@
       <plugin>
         <groupId>org.eclipse.tycho</groupId>
         <artifactId>tycho-surefire-plugin</artifactId>
-        <version>${tycho-version}</version>
         <configuration>
-          <argLine>-Declipse.perf.dbloc=${perf.database.loc} -Declipse.perf.config=${perf.config}</argLine>
-          <runOrder>reversealphabetical</runOrder>
-          <includes>
-              <include>**/RunAllPerfTests.java</include>
-              <include>**/PerfResultsToJSon.java</include>
-          </includes>
-          <useUIHarness>false</useUIHarness>
-          <useUIThread>false</useUIThread>
-          <product>org.eclipse.platform.ide</product>
+          <!-- Default build will not find any tests, but the profiles below
+               can define some. -->
+          <failIfNoTests>false</failIfNoTests>
         </configuration>
       </plugin>
-      <plugin>
-        <artifactId>maven-antrun-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>deploy-performance-files</id>
-            <phase>install</phase>
-              <goals>
-                <goal>run</goal>
-              </goals>
-              <configuration>
-              <target>
-                <copy includeemptydirs="false"
-                  todir="${perfFilesDestination}">
-                  <fileset dir=".">
-                    <include name="*.json" />
-                    <include name="*.js" />
-                  </fileset>
-                </copy>
-              </target>
-            </configuration>
-          </execution>
-        </executions>
-      </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>
-        <version>2.6.1</version>
-        <executions>
-          <execution>
-            <id>clean-performance-files</id>
-            <phase>clean</phase>
-            <configuration>
-              <filesets>
-                <fileset>
-                  <directory>.</directory>
-                  <includes>
-                    <include>*.json</include>
-                    <include>*.js</include>
-                  </includes>
-                </fileset>
-              </filesets>
-            </configuration>
-            <goals>
-              <goal>clean</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
     </plugins>
   </build>
+
+  <profiles>
+    <!-- Profile to run the performance tests -->
+    <profile>
+      <id>performance</id>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.eclipse.tycho</groupId>
+            <artifactId>tycho-surefire-plugin</artifactId>
+            <version>${tycho-version}</version>
+            <configuration>
+              <argLine>-Declipse.perf.dbloc=${perf.database.loc} -Declipse.perf.config=${perf.config}</argLine>
+              <runOrder>reversealphabetical</runOrder>
+              <includes>
+                  <include>**/RunAllPerfTests.java</include>
+                  <include>**/PerfResultsToJSon.java</include>
+              </includes>
+              <useUIHarness>false</useUIHarness>
+              <useUIThread>false</useUIThread>
+              <product>org.eclipse.platform.ide</product>
+            </configuration>
+          </plugin>
+          <plugin>
+            <artifactId>maven-antrun-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>deploy-performance-files</id>
+                <phase>install</phase>
+                  <goals>
+                    <goal>run</goal>
+                  </goals>
+                  <configuration>
+                  <target>
+                    <copy includeemptydirs="false"
+                      todir="${perfFilesDestination}">
+                      <fileset dir=".">
+                        <include name="*.json" />
+                        <include name="*.js" />
+                      </fileset>
+                    </copy>
+                  </target>
+                </configuration>
+              </execution>
+            </executions>
+          </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>
+            <version>2.6.1</version>
+            <executions>
+              <execution>
+                <id>clean-performance-files</id>
+                <phase>clean</phase>
+                <configuration>
+                  <filesets>
+                    <fileset>
+                      <directory>.</directory>
+                      <includes>
+                        <include>*.json</include>
+                        <include>*.js</include>
+                      </includes>
+                    </fileset>
+                  </filesets>
+                </configuration>
+                <goals>
+                  <goal>clean</goal>
+                </goals>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+   </profile>
+ </profiles>
+
+
 </project>

diff --git a/releng/pom.xml b/releng/pom.xml
index 42f7ada26b8438b346284d87afcf14b5418a5c09..f8ded0741076868fa26d553ab485b0c030feb430 100644 (file)
--- a/releng/pom.xml
+++ b/releng/pom.xml
@@ -30,18 +30,11 @@
   <name>Trace Compass Release Engineering Parent</name>
 
   <modules>
+    <module>org.eclipse.tracecompass.alltests</module>
     <module>org.eclipse.tracecompass.releng-site</module>
     <module>org.eclipse.tracecompass.target</module>
     <module>org.eclipse.tracecompass.testing</module>
   </modules>
-  
-  <profiles>
-    <profile>
-      <id>performance</id>
-      <modules>
-        <module>org.eclipse.tracecompass.alltests</module>
-      </modules>
-     </profile>
-   </profiles>
+
 
 </project>