summaryrefslogtreecommitdiff
path: root/build.xml
diff options
context:
space:
mode:
authorJason Zaugg <jzaugg@gmail.com>2015-01-28 12:20:24 +1000
committerJason Zaugg <jzaugg@gmail.com>2015-01-28 18:20:09 +1000
commit17fac6c1f74f7b1801050fb401713a7b83753add (patch)
tree9cfc5f87bccfdda582a04525603619223c65c9ae /build.xml
parent20cb778085bdbc9dc48f59e3a1a1e7a5e3915107 (diff)
downloadscala-17fac6c1f74f7b1801050fb401713a7b83753add.tar.gz
scala-17fac6c1f74f7b1801050fb401713a7b83753add.tar.bz2
scala-17fac6c1f74f7b1801050fb401713a7b83753add.zip
Add an IntelliJ module for the Pax Exam based OSGi tests
We can now edit these in IntelliJ, as per the regular JUnit tests.
Diffstat (limited to 'build.xml')
-rwxr-xr-xbuild.xml5
1 files changed, 3 insertions, 2 deletions
diff --git a/build.xml b/build.xml
index 02b98e66d8..4def1f595c 100755
--- a/build.xml
+++ b/build.xml
@@ -294,6 +294,7 @@ TODO:
<dependency groupId="ch.qos.logback" artifactId="logback-classic" version="1.1.2"/>
<dependency groupId="junit" artifactId="junit" version="${junit.version}"/>
</artifact:dependencies>
+ <copy-deps project="pax.exam"/>
<artifact:dependencies pathId="osgi.framework.felix">
<dependency groupId="org.apache.felix" artifactId="org.apache.felix.framework" version="${osgi.felix.version}"/>
@@ -1375,8 +1376,8 @@ TODO:
</target>
<target name="test.osgi" depends="test.osgi.comp">
- <if><isset property="has.java8"/><then>
- <echo message="Skipping OSGi JUnit tests on Java 8. See SI-8642"/>
+ <if><isset property="test.osgi.skip"/><then>
+ <echo message="Skipping OSGi JUnit tests"/>
</then><else>
<echo message="Running OSGi JUnit tests. Output in ${build-osgi.dir}"/>
<stopwatch name="test.osgi.timer"/>