From 6b22bdafa372e3f844c8ad75ccb4240da67d5ef3 Mon Sep 17 00:00:00 2001
From: rhaag <none@none>
Date: Mon, 26 Sep 2011 17:40:20 +0200
Subject: [PATCH] FX-49 control run of tests
---
pom.xml | 14 +++++++++++++-
src/main/templates/maven.build.properties | 3 ++-
2 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index 55798be04fe..566f14d1287 100644
--- a/pom.xml
+++ b/pom.xml
@@ -283,6 +283,13 @@
values -->
<filtering>false</filtering>
</resource>
+ <!-- TODO: RH: include static to react on changes during devel, target not working!
+ <resource>
+ <directory>src/main/webapp/static</directory>
+ <targetPath>${project.build.directory}/static</targetPath>
+ <filtering>false</filtering>
+ </resource>
+ -->
</resources>
<plugins>
<plugin>
@@ -388,6 +395,11 @@
<type>1</type>
<location>${basedir}/olat.local.properties</location>
</linkedResource>
+ <linkedResource>
+ <name>/src/main/java/maven.build.properties</name>
+ <type>1</type>
+ <location>${basedir}/target/${artifactId}-${project.version}/WEB-INF/classes/maven.build.properties</location>
+ </linkedResource>
</linkedResources>
@@ -413,7 +425,7 @@
<version>2.5</version>
<configuration>
<testFailureIgnore>true</testFailureIgnore>
- <skipTests>true</skipTests>
+ <skipTests>${skipTests}</skipTests>
<excludes>
<!-- TODO:gs -->
<exclude>**/TestTable.java</exclude>
diff --git a/src/main/templates/maven.build.properties b/src/main/templates/maven.build.properties
index 72ee359767a..f3c76a84971 100644
--- a/src/main/templates/maven.build.properties
+++ b/src/main/templates/maven.build.properties
@@ -1,2 +1,3 @@
project.build.home.directory=${basedir}
-build.version=${version}
\ No newline at end of file
+build.version=${version}
+skipTests=true
\ No newline at end of file
--
GitLab