diff options
| author | Sven Gothel <[email protected]> | 2010-03-25 22:49:16 +0100 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2010-03-25 22:49:16 +0100 |
| commit | 9a1b43908b3bb1cd5dd5fadafb3b23d6e9a2cf46 (patch) | |
| tree | a73f826bae48eaf9132403511e9f20742463e1a9 /test | |
| parent | 3a32650d4229f9b4ad1f527d9e30c24ddb69bb3f (diff) | |
http://www.jogamp.org/bugzilla/show_bug.cgi?id=390
Adding 'plain' junit tests.
Plain stands for the simple processing of:
ant.junit.compile: gluegen -> java/c files, javac/cc, jar
ant.junit.run: junit batch run
Avoiding 'black magic', ie kicking off gluegen and ant-compilation
from within the junit tests.
Same methodology as the JOGL junit tests,
junit test sources are under 'src/junit'
This way, the migration to other platform tests might be easier,
as well as the we don't need to pass through ant properties (ant - junit - ant),
see 3a32650d4229f9b4ad1f527d9e30c24ddb69bb3f.
Diffstat (limited to 'test')
| -rw-r--r-- | test/junit/com/sun/gluegen/BuildUtil.java | 2 | ||||
| -rw-r--r-- | test/junit/com/sun/gluegen/build.xml | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/test/junit/com/sun/gluegen/BuildUtil.java b/test/junit/com/sun/gluegen/BuildUtil.java index 4477d7b..bbc2b16 100644 --- a/test/junit/com/sun/gluegen/BuildUtil.java +++ b/test/junit/com/sun/gluegen/BuildUtil.java @@ -56,7 +56,7 @@ public final class BuildUtil { project = new Project(); project.setBaseDir(new File(gluegenRoot)); project.setProperty("rootrel.build", rootrel_build); - passSystemProperty(project, "gluegen.user.compiler.file"); + passSystemProperty(project, "gluegen-cpptasks.file"); passSystemProperty(project, "os.arch"); DefaultLogger logger = new DefaultLogger(); diff --git a/test/junit/com/sun/gluegen/build.xml b/test/junit/com/sun/gluegen/build.xml index ab71431..91a4e8e 100644 --- a/test/junit/com/sun/gluegen/build.xml +++ b/test/junit/com/sun/gluegen/build.xml @@ -38,7 +38,7 @@ </target> - <target name="compile.native" depends="c.configure.linux"> + <target name="compile.native" depends="c.configure"> <echo message=" - - - compiling natives - - - "/> @@ -87,7 +87,7 @@ </target> - <target name="c.configure.linux" depends="gluegen.cpptasks.detect.os,gluegen.cpptasks.setup.compiler"> + <target name="c.configure" depends="gluegen.cpptasks.detect.os,gluegen.cpptasks.setup.compiler"> <property name="compiler.cfg.id" value="${compiler.cfg.id.base}" /> <property name="linker.cfg.id" value="${linker.cfg.id.base}" /> </target> |