summaryrefslogtreecommitdiffstats
path: root/src/junit/com/jogamp
diff options
context:
space:
mode:
authorSven Gothel <[email protected]>2011-07-25 13:58:45 +0200
committerSven Gothel <[email protected]>2011-07-25 13:58:45 +0200
commit1d1fd17cca064306dd5d528d59a4bce0581dcc63 (patch)
treef413cb14a7613832c1d4c252ba99f1999ea9d892 /src/junit/com/jogamp
parent2488c4de3e5fe7c4b8258af3fb8aae9b4d5091ce (diff)
Cross JUnit Tests - All Passed: Android+Linux armv7
- junit.cross targets: - use scripting to save time, ie write all target commands to script, xfer, exec - junit: delete result folder just before junit.run - Test BuildEnvironment.java: Simplify path config via properties (for android) - AndroidVersion: No annoying exception dump if Build$VERSION* is not found (not android) - launch scripts: use absolute TARGET_ROOT path for dynamic linker env.
Diffstat (limited to 'src/junit/com/jogamp')
-rw-r--r--src/junit/com/jogamp/gluegen/test/junit/generation/BuildEnvironment.java18
1 files changed, 8 insertions, 10 deletions
diff --git a/src/junit/com/jogamp/gluegen/test/junit/generation/BuildEnvironment.java b/src/junit/com/jogamp/gluegen/test/junit/generation/BuildEnvironment.java
index 3b883aa..a09d1a9 100644
--- a/src/junit/com/jogamp/gluegen/test/junit/generation/BuildEnvironment.java
+++ b/src/junit/com/jogamp/gluegen/test/junit/generation/BuildEnvironment.java
@@ -51,23 +51,21 @@ public final class BuildEnvironment {
out.println(VersionUtil.getPlatformInfo());
out.println("VM: " + System.getProperty("java.vm.name"));
+ // setup paths
String rootrel_build_tmp = System.getProperty("rootrel.build");
if(null==rootrel_build_tmp || rootrel_build_tmp.length()==0) {
- rootrel_build_tmp = "build" ;
+ throw new RuntimeException("Pls specify property rootrel.build");
}
rootrel_build = rootrel_build_tmp;
out.println("rootrel.build: " + rootrel_build);
- // setup paths
- try {
- File executionRoot = new File(BuildEnvironment.class.getProtectionDomain().getCodeSource().getLocation().toURI());
- out.println("execution root: " + executionRoot);
- gluegenRoot = executionRoot.getParentFile().getParentFile().getParentFile().getParentFile().toString();
- out.println("gluegen project root: " + gluegenRoot);
- } catch (URISyntaxException ex) {
- throw new RuntimeException("can not determine gluegen root", ex);
+ String gluegen_root_tmp = System.getProperty("gluegen.root");
+ if(null==gluegen_root_tmp || gluegen_root_tmp.length()==0) {
+ throw new RuntimeException("Pls specify property gluegen.root");
}
-
+ gluegenRoot = gluegen_root_tmp;
+ out.println("gluegen.root: " + gluegenRoot);
+
testOutput = gluegenRoot + "/" + rootrel_build + "/test";
out.println("testOutput: "+testOutput);