diff options
| author | Sven Gothel <[email protected]> | 2011-08-02 10:34:53 +0200 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2011-08-02 10:34:53 +0200 |
| commit | b00d52924f020a1fa1b557faad7be2189191b352 (patch) | |
| tree | d8fc5a5338ece4659e86bf5582e0d18249e5aa0f | |
| parent | 2d736fa22d2ad76a8e4c38671fe8d34c993955f2 (diff) | |
cross test linux/armv7 scripts: use generic ANT_PATH
| -rw-r--r-- | make/scripts/crosstest-java-linux-armv7-rel.sh | 3 | ||||
| -rw-r--r-- | make/scripts/crosstest-junit-linux-armv7-rel.sh | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/make/scripts/crosstest-java-linux-armv7-rel.sh b/make/scripts/crosstest-java-linux-armv7-rel.sh index f49383a..2b44379 100644 --- a/make/scripts/crosstest-java-linux-armv7-rel.sh +++ b/make/scripts/crosstest-java-linux-armv7-rel.sh @@ -6,6 +6,7 @@ export TARGET_UID=jogamp export TARGET_IP=beagle01 export TARGET_ROOT=projects-cross +export ANT_PATH=/usr/share/ant export BUILD_DIR=../build-linux-armv7 #TSTCLASS=com.jogamp.gluegen.test.junit.generation.Test1p2ProcAddressEmitter @@ -19,7 +20,7 @@ cd $TARGET_ROOT/gluegen/make ; LD_LIBRARY_PATH=$BUILD_DIR/obj:$BUILD_DIR/test/build/natives \ java \ -Djava.library.path=$BUILD_DIR/obj:$BUILD_DIR/test/build/natives \ - -Djava.class.path=lib/junit.jar:/usr/share/ant/lib/ant.jar:/usr/share/ant/lib/ant-junit.jar:$BUILD_DIR/gluegen.jar:$BUILD_DIR/test/build/gluegen-test.jar \ + -Djava.class.path=lib/junit.jar:$ANT_PATH/lib/ant.jar:$ANT_PATH/lib/ant-junit.jar:$BUILD_DIR/gluegen.jar:$BUILD_DIR/test/build/gluegen-test.jar \ -Djogamp.debug.JNILibLoader=true \ -Djogamp.debug.NativeLibrary=true \ -Djogamp.debug.NativeLibrary.Lookup=true \ diff --git a/make/scripts/crosstest-junit-linux-armv7-rel.sh b/make/scripts/crosstest-junit-linux-armv7-rel.sh index 519824b..6db3b49 100644 --- a/make/scripts/crosstest-junit-linux-armv7-rel.sh +++ b/make/scripts/crosstest-junit-linux-armv7-rel.sh @@ -7,6 +7,7 @@ export TARGET_IP=beagle01 export TARGET_ROOT=projects-cross export BUILD_DIR=../build-linux-armv7 +export ANT_PATH=/usr/share/ant TSTCLASS=com.jogamp.gluegen.test.junit.generation.Test1p2ProcAddressEmitter @@ -18,7 +19,7 @@ cd $TARGET_ROOT/gluegen/make ; LD_LIBRARY_PATH=$BUILD_DIR/obj:$BUILD_DIR/test/build/natives \ java \ -Djava.library.path=$BUILD_DIR/obj:$BUILD_DIR/test/build/natives \ - -Djava.class.path=lib/junit.jar:/usr/share/ant/lib/ant.jar:/usr/share/ant/lib/ant-junit.jar:$BUILD_DIR/gluegen.jar:$BUILD_DIR/test/build/gluegen-test.jar \ + -Djava.class.path=lib/junit.jar:$ANT_PATH/lib/ant.jar:$ANT_PATH/lib/ant-junit.jar:$BUILD_DIR/gluegen.jar:$BUILD_DIR/test/build/gluegen-test.jar \ -Djogamp.debug.JNILibLoader=true \ -Djogamp.debug.NativeLibrary=true \ -Djogamp.debug.NativeLibrary.Lookup=true \ |