提交 3c88fc56 编写于 作者: A Arnaud Héritier

JENKINS-9788 : Put test-harness execution in a profile.

You can skip them by adding -P-run-test-harness in the build command line
上级 cd48b4eb
......@@ -45,50 +45,19 @@ THE SOFTWARE.
<build>
<plugins>
<plugin>
<groupId>org.kohsuke.stapler</groupId>
<artifactId>maven-stapler-plugin</artifactId>
<version>1.15</version>
<extensions>true</extensions>
</plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<skip>true</skip><!-- tests now run by maven-junit-plugin -->
<skip>true</skip>
<!-- tests now run by maven-junit-plugin -->
</configuration>
</plugin>
<plugin>
<!-- see http://maven-junit-plugin.kenai.com/ for more info -->
<groupId>org.kohsuke</groupId>
<artifactId>maven-junit-plugin</artifactId>
<version>1.9</version>
<executions>
<execution>
<goals>
<goal>test</goal>
</goals>
<configuration>
<fork>true</fork>
<concurrency>${concurrency}</concurrency>
<argLine>-Dfile.encoding=UTF-8</argLine>
<timeout>300</timeout>
<systemProperties>
<property>
<!-- use AntClassLoader that supports predictable file handle release -->
<name>hudson.ClassicPluginStrategy.useAntClassLoader</name>
<value>true</value>
</property>
<property>
<name>hudson.maven.debug</name>
<value>${mavenDebug}</value>
</property>
<property>
<name>java.io.tmpdir</name>
<value>${project.build.directory}</value>
</property>
<property>
<name>buildDirectory</name>
<value>${project.build.directory}</value>
</property>
</systemProperties>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.kohsuke.gmaven</groupId>
<artifactId>gmaven-plugin</artifactId>
......@@ -120,15 +89,9 @@ THE SOFTWARE.
</dependency>
</dependencies>
</plugin>
<plugin>
<groupId>org.kohsuke.stapler</groupId>
<artifactId>maven-stapler-plugin</artifactId>
<version>1.15</version>
<extensions>true</extensions>
</plugin>
</plugins>
</build>
<dependencies>
<dependency>
<!--
......@@ -159,7 +122,8 @@ THE SOFTWARE.
<groupId>org.jvnet.hudson</groupId>
<artifactId>test-annotations</artifactId>
<version>1.0</version>
<scope>compile</scope><!-- in this module we need this as a compile scope, whereas in the parent it's test -->
<scope>compile</scope>
<!-- in this module we need this as a compile scope, whereas in the parent it's test -->
</dependency>
<dependency>
<groupId>org.jvnet.mock-javamail</groupId>
......@@ -181,11 +145,11 @@ THE SOFTWARE.
<artifactId>htmlunit</artifactId>
<version>2.6-jenkins-4</version>
<exclusions>
<exclusion>
<!-- hides JDK DOM classes in Eclipse -->
<groupId>xml-apis</groupId>
<artifactId>xml-apis</artifactId>
</exclusion>
<exclusion>
<!-- hides JDK DOM classes in Eclipse -->
<groupId>xml-apis</groupId>
<artifactId>xml-apis</artifactId>
</exclusion>
</exclusions>
</dependency>
......@@ -214,6 +178,54 @@ THE SOFTWARE.
</dependencies>
<profiles>
<profile>
<id>run-test-harness</id>
<build>
<plugins>
<plugin>
<!-- see http://maven-junit-plugin.kenai.com/ for more info -->
<groupId>org.kohsuke</groupId>
<artifactId>maven-junit-plugin</artifactId>
<version>1.9</version>
<executions>
<execution>
<goals>
<goal>test</goal>
</goals>
<configuration>
<fork>true</fork>
<concurrency>${concurrency}</concurrency>
<argLine>-Dfile.encoding=UTF-8</argLine>
<timeout>300</timeout>
<systemProperties>
<property>
<!-- use AntClassLoader that supports predictable file handle release -->
<name>hudson.ClassicPluginStrategy.useAntClassLoader</name>
<value>true</value>
</property>
<property>
<name>hudson.maven.debug</name>
<value>${mavenDebug}</value>
</property>
<property>
<name>java.io.tmpdir</name>
<value>${project.build.directory}</value>
</property>
<property>
<name>buildDirectory</name>
<value>${project.build.directory}</value>
</property>
</systemProperties>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
<profile>
<id>light-test</id>
<properties>
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册