summaryrefslogtreecommitdiffstats
path: root/make
diff options
context:
space:
mode:
authorSven Gothel <[email protected]>2014-01-26 03:15:47 +0100
committerSven Gothel <[email protected]>2014-01-26 03:15:47 +0100
commit30b423fc8d71d05e789c087b2d45cf0e7bf8c542 (patch)
tree85feb620f559c2b9bc353c6b16e158f714439949 /make
parentaac4c5fc4ab7c77eff3b71f518100dd182ec2c33 (diff)
Add unit test TestJoclVersion and UITestCase base class for singleton unit tests ; Fix setenv-jocl.sh: Add jocl-test.jar
Diffstat (limited to 'make')
-rwxr-xr-xmake/scripts/setenv-jocl.sh2
-rw-r--r--make/scripts/tests.sh3
2 files changed, 3 insertions, 2 deletions
diff --git a/make/scripts/setenv-jocl.sh b/make/scripts/setenv-jocl.sh
index 72819b4e..e737e70c 100755
--- a/make/scripts/setenv-jocl.sh
+++ b/make/scripts/setenv-jocl.sh
@@ -99,7 +99,7 @@ if [ -z "$ANT_PATH" ] ; then
fi
ANT_JARS=$ANT_PATH/lib/ant.jar:$ANT_PATH/lib/ant-junit.jar
-JOCL_JAR="$JOCL_BUILDDIR"/jar/jocl.jar
+JOCL_JAR="$JOCL_BUILDDIR"/jar/jocl.jar:"$JOCL_BUILDDIR"/jar/jocl-test.jar
echo GLUEGEN BUILDDIR: "$GLUEGEN_BUILDDIR"
echo JOAL BUILDDIR: "$JOAL_BUILDDIR"
diff --git a/make/scripts/tests.sh b/make/scripts/tests.sh
index 642985fd..50ece90f 100644
--- a/make/scripts/tests.sh
+++ b/make/scripts/tests.sh
@@ -107,5 +107,6 @@ function testawt() {
#
# Version
#
-testnoawt com.jogamp.opencl.JoclVersion $*
+#testnoawt com.jogamp.opencl.JoclVersion $*
+testnoawt com.jogamp.opencl.TestJoclVersion $*