151 Bernhard Ocklin 2009-11-04
add junit config option
modified:
clusterj-test/Makefile.am
configure.in
150 Craig L Russell 2009-11-03
Big Endian Bit Long Boolean
modified:
clusterj-test/src/main/java/testsuite/clusterj/BitTypesTest.java
clusterj-tie/src/main/java/com/mysql/clusterj/tie/Utility.java
=== modified file 'clusterj-test/Makefile.am'
--- a/clusterj-test/Makefile.am 2009-11-03 19:48:34 +0000
+++ b/clusterj-test/Makefile.am 2009-11-04 10:37:01 +0000
@@ -15,6 +15,7 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
JAVAROOT=target/classes
+CLASSPATH_ENV=CLASSPATH=../clusterj-api/target/classes:../clusterj-core/target/classes:$(CLUSTERJ_JUNIT)
clusterj_testdir= $(prefix)/share/mysql/java/
clusterj_test_JAR = clusterj-test-@VERSION@.jar
=== modified file 'configure.in'
--- a/configure.in 2009-11-02 09:47:40 +0000
+++ b/configure.in 2009-11-04 10:37:01 +0000
@@ -14,6 +14,12 @@ AC_CHECK_PROG(JAR, jar, jar, no)
clusterj_ndbjtie_classpaths=no
clusterj_openjpa_classpaths=no
+clusterj_junit_classpath=no
+
+AC_ARG_WITH([junit],
+ [AS_HELP_STRING([--with-junit], [yes])],
+ clusterj_junit_classpath="$with_junit",
+ [with_junit=yes])
AC_ARG_WITH([ndb-cluster],
[AS_HELP_STRING([--with-ndb-cluster], [yes])],
@@ -25,6 +31,12 @@ AC_ARG_WITH([openjpa],
clusterj_openjpa_classpaths="$with_openjpa",
[with_openjpa=yes])
+AS_IF([test "x$clusterj_junit_classpath" != xno],
+ AC_CHECK_FILE($clusterj_junit_classpath, , AC_ERROR(JUnit not found at "$clusterj_junit_classpath"))
+ CLUSTERJ_JUNIT=$clusterj_junit_classpath
+ AC_SUBST(CLUSTERJ_JUNIT),
+ AC_ERROR(Missing JUnit))
+
AS_IF([test "x$clusterj_ndb_classpaths" != xno],
AC_CHECK_FILE($clusterj_ndb_classpaths/Makefile, , AC_ERROR($clusterj_ndb_classpaths/Makefile not found))
CLUSTER_VERSION=`grep '^VERSION' $clusterj_ndb_classpaths/Makefile | sed 's/VERSION = //'`
Attachment: [text/bzr-bundle]
| Thread |
|---|
| • bzr push into clusterj branch (bernhard.ocklin:150 to 151) | Bernhard Ocklin | 4 Nov |
