summaryrefslogtreecommitdiffstats
path: root/make/build-test.xml
diff options
context:
space:
mode:
authorSven Gothel <[email protected]>2015-03-24 03:44:24 +0100
committerSven Gothel <[email protected]>2015-03-24 03:44:24 +0100
commit88d51db39f3b00df1462eb0a18c1825ae1e86485 (patch)
tree6ba949ff85c1ff48cedfd866eb0622cafc583f40 /make/build-test.xml
parentb755b045fb7e3c8306f24dd645297992ab8db7f9 (diff)
Bug 1149 - Replacing PCPP w/ JCPP, allowing complete macro handling (Part-2: JCPP submodule, build, test and doc)
Diffstat (limited to 'make/build-test.xml')
-rw-r--r--make/build-test.xml10
1 files changed, 7 insertions, 3 deletions
diff --git a/make/build-test.xml b/make/build-test.xml
index fe1aaec..68f674f 100644
--- a/make/build-test.xml
+++ b/make/build-test.xml
@@ -36,6 +36,8 @@
<property name="test.junit.generation.rel" value="${test.junit.rel}/gluegen/test/junit/generation" />
<property name="test.junit.generation.dir" value="${test.base.dir}/${test.junit.generation.rel}" />
+ <property name="test.jcpp.base.dir" value="${project.root}/jcpp/src/test/java" />
+
<property name="tempdir" value="${project.root}/build-temp" />
<property name="build" location="${project.root}/${rootrel.build}" />
<property name="test.dir" value="${gluegen.root}/${rootrel.build}/test"/>
@@ -169,6 +171,7 @@
<classpath refid="junit.compile.classpath"/>
<compilerarg value="-proc:none"/>
<src path="${test.base.dir}"/>
+ <src path="${test.jcpp.base.dir}"/>
<src path="${build_t.gen}" />
</javac>
@@ -266,9 +269,10 @@
<target name="junit.compile.check" depends="init">
<uptodate property="junit.compile.skip">
- <srcfiles dir= "." includes="*.xml"/>
- <srcfiles dir= "${test.base.dir}" includes="**"/>
- <srcfiles file="${gluegen.jar}" />
+ <srcfiles dir= "." includes="*.xml"/>
+ <srcfiles dir= "${test.base.dir}" includes="**"/>
+ <srcfiles dir= "${test.jcpp.base.dir}" includes="**"/>
+ <srcfiles file="${gluegen.jar}" />
<mapper type="merge" to="${gluegen-test.jar}"/>
</uptodate>
</target>