diff options
| -rwxr-xr-x | make/build.xml | 7 | ||||
| -rw-r--r-- | test/junit/com/sun/gluegen/BuildUtil.java | 6 | ||||
| -rw-r--r-- | test/junit/com/sun/gluegen/PCPPTest.java | 3 | ||||
| -rw-r--r-- | test/junit/com/sun/gluegen/build.xml | 2 |
4 files changed, 10 insertions, 8 deletions
diff --git a/make/build.xml b/make/build.xml index f918f62..a79a38e 100755 --- a/make/build.xml +++ b/make/build.xml @@ -481,13 +481,14 @@ - original source. --> <property name="gluegen-rt.classes" value="com/jogamp/gluegen/runtime/**"/> + <property name="jogamp.common.classes" value="com/jogamp/common/**"/> <!--compile gluegen-rt with source=1.4 first--> <javac destdir="${classes}" source="1.4" debug="true" debuglevel="source,lines,vars" - includes="${gluegen-rt.classes}" + includes="${gluegen-rt.classes},${jogamp.common.classes}" excludes="${gluegen.excludes}"> <src path="${src.java}" /> <src path="${src.generated.java}" /> @@ -533,6 +534,7 @@ <fileset dir="${classes}"> <include name="com/jogamp/gluegen/runtime/*.class" /> <include name="com/jogamp/gluegen/runtime/opengl/*.class" /> + <include name="com/jogamp/common/**" /> </fileset> </jar> @@ -549,6 +551,7 @@ <fileset dir="${classes-cdc}"> <include name="com/jogamp/gluegen/runtime/*.class" /> <include name="com/jogamp/gluegen/runtime/opengl/*.class" /> + <include name="com/jogamp/common/*.class" /> </fileset> </jar> @@ -586,7 +589,7 @@ <fileset dir="${build}/test/build/classes"> <include name="com/sun/gluegen/**Test*"/> </fileset> - <formatter usefile="false" type="brief"/> + <formatter usefile="false" type="plain"/> <formatter usefile="true" type="xml"/> </batchtest> <classpath> diff --git a/test/junit/com/sun/gluegen/BuildUtil.java b/test/junit/com/sun/gluegen/BuildUtil.java index dd46221..35dc0c1 100644 --- a/test/junit/com/sun/gluegen/BuildUtil.java +++ b/test/junit/com/sun/gluegen/BuildUtil.java @@ -43,8 +43,8 @@ public final class BuildUtil { throw new RuntimeException("can not determine gluegen root", ex); } - path = gluegenRoot + "/test/junit/com/sun/gluegen"; - testOutput = gluegenRoot + "/" + rootrel_build + "/test"; + path = gluegenRoot + "/test/junit/com/sun/gluegen"; + testOutput = gluegenRoot + "/" + rootrel_build + "/test"; out.println("path: "+path); out.println("testOutput: "+testOutput); @@ -61,7 +61,7 @@ public final class BuildUtil { DefaultLogger logger = new DefaultLogger(); logger.setErrorPrintStream(out); logger.setOutputPrintStream(out); - logger.setMessageOutputLevel(Project.MSG_INFO); + logger.setMessageOutputLevel(Project.MSG_WARN); project.addBuildListener(logger); project.init(); diff --git a/test/junit/com/sun/gluegen/PCPPTest.java b/test/junit/com/sun/gluegen/PCPPTest.java index c086c47..3764212 100644 --- a/test/junit/com/sun/gluegen/PCPPTest.java +++ b/test/junit/com/sun/gluegen/PCPPTest.java @@ -1,7 +1,6 @@ package com.sun.gluegen; import com.sun.gluegen.pcpp.PCPP; -import java.io.BufferedOutputStream; import java.io.BufferedReader; import java.io.ByteArrayOutputStream; import java.io.FileNotFoundException; @@ -18,7 +17,7 @@ import static org.junit.Assert.*; public class PCPPTest { @Test - public void pcppTest() throws FileNotFoundException, IOException { + public void pcppMacroDefinitionTest() throws FileNotFoundException, IOException { PCPP pp = new PCPP(Collections.<String>emptyList()); ByteArrayOutputStream output = new ByteArrayOutputStream(); diff --git a/test/junit/com/sun/gluegen/build.xml b/test/junit/com/sun/gluegen/build.xml index 24235c0..4889ab1 100644 --- a/test/junit/com/sun/gluegen/build.xml +++ b/test/junit/com/sun/gluegen/build.xml @@ -29,7 +29,7 @@ <mkdir dir="${build.dir.java}"/> - <javac destdir="${build.dir.java}" source="1.5" failonerror="true" debug="true" verbose="true" debuglevel="lines,vars,source"> + <javac destdir="${build.dir.java}" source="1.5" failonerror="true" debug="true" debuglevel="lines,vars,source"> <src path="${src.dir}"/> <classpath path="${gluegen.root}/${rootrel.build}/classes:${src.dir}:${gluegen.root}/${rootrel.build}/antlr-3.2.jar:${gluegen.root}/make/lib/junit-4.5.jar:${tools.jar}:${ant.core.lib}"/> </javac> |