diff options
-rw-r--r-- | aclocal/ax_java.m4 | 2 | ||||
-rw-r--r-- | lib/java/build.xml | 51 | ||||
-rwxr-xr-x | lib/java/test/TestClient (renamed from test/java/TestClient) | 0 | ||||
-rw-r--r-- | lib/java/test/TestNonblockingServer (renamed from test/java/TestNonblockingServer) | 0 | ||||
-rwxr-xr-x | lib/java/test/TestServer (renamed from test/java/TestServer) | 0 | ||||
-rw-r--r-- | lib/java/test/org/apache/thrift/test/DeepCopyTest.java (renamed from test/java/src/DeepCopyTest.java) | 0 | ||||
-rw-r--r-- | lib/java/test/org/apache/thrift/test/EqualityTest.java (renamed from test/java/src/EqualityTest.java) | 0 | ||||
-rw-r--r-- | lib/java/test/org/apache/thrift/test/IdentityTest.java (renamed from test/java/src/IdentityTest.java) | 0 | ||||
-rw-r--r-- | lib/java/test/org/apache/thrift/test/JSONProtoTest.java (renamed from test/java/src/JSONProtoTest.java) | 0 | ||||
-rw-r--r-- | lib/java/test/org/apache/thrift/test/JavaBeansTest.java (renamed from test/java/src/JavaBeansTest.java) | 0 | ||||
-rw-r--r-- | lib/java/test/org/apache/thrift/test/OverloadNonblockingServer.java (renamed from test/java/src/OverloadNonblockingServer.java) | 0 | ||||
-rw-r--r-- | lib/java/test/org/apache/thrift/test/TestClient.java (renamed from test/java/src/TestClient.java) | 0 | ||||
-rw-r--r-- | lib/java/test/org/apache/thrift/test/TestNonblockingServer.java (renamed from test/java/src/TestNonblockingServer.java) | 0 | ||||
-rw-r--r-- | lib/java/test/org/apache/thrift/test/TestServer.java (renamed from test/java/src/TestServer.java) | 0 | ||||
-rw-r--r-- | lib/java/test/org/apache/thrift/test/ToStringTest.java (renamed from test/java/src/ToStringTest.java) | 0 | ||||
-rw-r--r-- | test/java/build.xml | 64 |
16 files changed, 52 insertions, 65 deletions
diff --git a/aclocal/ax_java.m4 b/aclocal/ax_java.m4 index 70ec2c345..abff8c6ca 100644 --- a/aclocal/ax_java.m4 +++ b/aclocal/ax_java.m4 @@ -32,7 +32,7 @@ dnl TODO: allow to exclude compilers (rationale: most Java programs cannot compi dnl with some compilers like guavac). AC_DEFUN([AX_PROG_JAVAC],[ -test -z "$JAVAC" && AC_CHECK_PROGS(JAVAC, "gcj -C" guavac jikes javac) +test -z "$JAVAC" && AC_CHECK_PROGS(JAVAC, "gcj -C" guavac javac) test -z "$JAVAC" && AC_MSG_ERROR([no acceptable Java compiler found in \$PATH]) AX_PROG_JAVAC_WORKS ]) diff --git a/lib/java/build.xml b/lib/java/build.xml index 6f9d0b092..1215de123 100644 --- a/lib/java/build.xml +++ b/lib/java/build.xml @@ -2,13 +2,25 @@ <description>Thrift Build File</description> + <property name="gen" location="gen-java" /> + <property name="genbean" location="gen-javabean" /> + <property name="src" location="src" /> <property name="build" location="build" /> <property name="install.path" value="/usr/local/lib" /> + <property name="src.test" location="test" /> + <property name="build.test" location="${build}/test" /> + + <property name="test.thrift.home" location="../../test"/> + <property file="${user.home}/.thrift-build.properties" /> + + <property name="cpath" location="libthrift.jar:${thrift.extra.cpath}" /> + <target name="init"> <tstamp /> <mkdir dir="${build}"/> + <mkdir dir="${build.test}" /> </target> <target name="compile" depends="init"> @@ -27,7 +39,46 @@ <target name="clean"> <delete dir="${build}" /> + <delete dir="${gen}"/> + <delete dir="${genbean}"/> <delete file="libthrift.jar" /> </target> + <target name="compile-test" description="Build the test suite classes" depends="generate,dist"> + <javac debug="true" srcdir="${gen}" destdir="${build.test}" classpath="${cpath}" /> + <javac debug="true" srcdir="${genbean}" destdir="${build.test}" classpath="${cpath}" /> + <javac debug="true" srcdir="${src.test}" destdir="${build.test}" classpath="${cpath}:${gen}" /> + </target> + + <target name="test" description="Run the full test suite" depends="compile-test"> + <java classname="org.apache.thrift.test.JSONProtoTest" + classpath="${cpath}:${build.test}" failonerror="true" /> + <java classname="org.apache.thrift.test.IdentityTest" + classpath="${cpath}:${build.test}" failonerror="true" /> + <java classname="org.apache.thrift.test.EqualityTest" + classpath="${cpath}:${build.test}" failonerror="true" /> + <java classname="org.apache.thrift.test.ToStringTest" + classpath="${cpath}:${build.test}" failonerror="true" /> + <java classname="org.apache.thrift.test.DeepCopyTest" + classpath="${cpath}:${build.test}" failonerror="true" /> + <java classname="org.apache.thrift.test.JavaBeansTest" + classpath="${cpath}:${build.test}" failonerror="true" /> + </target> + + <target name="generate"> + <exec executable="../../compiler/cpp/thrift"> + <arg line="--gen java:hashcode ${test.thrift.home}/ThriftTest.thrift" /> + </exec> + <exec executable="../../compiler/cpp/thrift"> + <arg line="--gen java:hashcode ${test.thrift.home}/DebugProtoTest.thrift" /> + </exec> + <exec executable="../../compiler/cpp/thrift"> + <arg line="--gen java:hashcode ${test.thrift.home}/OptionalRequiredTest.thrift" /> + </exec> + <exec executable="../../compiler/cpp/thrift"> + <arg line="--gen java:beans,nocamel ${test.thrift.home}/JavaBeansTest.thrift" /> + </exec> + </target> + + </project> diff --git a/test/java/TestClient b/lib/java/test/TestClient index b848755e2..b848755e2 100755 --- a/test/java/TestClient +++ b/lib/java/test/TestClient diff --git a/test/java/TestNonblockingServer b/lib/java/test/TestNonblockingServer index f2c596b4e..f2c596b4e 100644 --- a/test/java/TestNonblockingServer +++ b/lib/java/test/TestNonblockingServer diff --git a/test/java/TestServer b/lib/java/test/TestServer index 82a6d2ac3..82a6d2ac3 100755 --- a/test/java/TestServer +++ b/lib/java/test/TestServer diff --git a/test/java/src/DeepCopyTest.java b/lib/java/test/org/apache/thrift/test/DeepCopyTest.java index 398337365..398337365 100644 --- a/test/java/src/DeepCopyTest.java +++ b/lib/java/test/org/apache/thrift/test/DeepCopyTest.java diff --git a/test/java/src/EqualityTest.java b/lib/java/test/org/apache/thrift/test/EqualityTest.java index 5ff0d696c..5ff0d696c 100644 --- a/test/java/src/EqualityTest.java +++ b/lib/java/test/org/apache/thrift/test/EqualityTest.java diff --git a/test/java/src/IdentityTest.java b/lib/java/test/org/apache/thrift/test/IdentityTest.java index afc114a65..afc114a65 100644 --- a/test/java/src/IdentityTest.java +++ b/lib/java/test/org/apache/thrift/test/IdentityTest.java diff --git a/test/java/src/JSONProtoTest.java b/lib/java/test/org/apache/thrift/test/JSONProtoTest.java index 4dba33f48..4dba33f48 100644 --- a/test/java/src/JSONProtoTest.java +++ b/lib/java/test/org/apache/thrift/test/JSONProtoTest.java diff --git a/test/java/src/JavaBeansTest.java b/lib/java/test/org/apache/thrift/test/JavaBeansTest.java index 707a4c257..707a4c257 100644 --- a/test/java/src/JavaBeansTest.java +++ b/lib/java/test/org/apache/thrift/test/JavaBeansTest.java diff --git a/test/java/src/OverloadNonblockingServer.java b/lib/java/test/org/apache/thrift/test/OverloadNonblockingServer.java index 49b750915..49b750915 100644 --- a/test/java/src/OverloadNonblockingServer.java +++ b/lib/java/test/org/apache/thrift/test/OverloadNonblockingServer.java diff --git a/test/java/src/TestClient.java b/lib/java/test/org/apache/thrift/test/TestClient.java index da638d231..da638d231 100644 --- a/test/java/src/TestClient.java +++ b/lib/java/test/org/apache/thrift/test/TestClient.java diff --git a/test/java/src/TestNonblockingServer.java b/lib/java/test/org/apache/thrift/test/TestNonblockingServer.java index 5df52da46..5df52da46 100644 --- a/test/java/src/TestNonblockingServer.java +++ b/lib/java/test/org/apache/thrift/test/TestNonblockingServer.java diff --git a/test/java/src/TestServer.java b/lib/java/test/org/apache/thrift/test/TestServer.java index a2f2d2076..a2f2d2076 100644 --- a/test/java/src/TestServer.java +++ b/lib/java/test/org/apache/thrift/test/TestServer.java diff --git a/test/java/src/ToStringTest.java b/lib/java/test/org/apache/thrift/test/ToStringTest.java index 56ce4c932..56ce4c932 100644 --- a/test/java/src/ToStringTest.java +++ b/lib/java/test/org/apache/thrift/test/ToStringTest.java diff --git a/test/java/build.xml b/test/java/build.xml deleted file mode 100644 index b779663a4..000000000 --- a/test/java/build.xml +++ /dev/null @@ -1,64 +0,0 @@ -<project name="thrifttest" default="test" basedir="."> - - <description>Thrift Test Build File</description> - - <property name="src" location="src" /> - <property name="gen" location="gen-java" /> - <property name="genbean" location="gen-javabean" /> - <property name="build" location="build" /> - <property name="cpath" location="../../lib/java/libthrift.jar:/usr/share/java/commons-lang-2.3.jar" /> - <property name="testjar" location="thrifttest.jar" /> - - <target name="init"> - <tstamp /> - <mkdir dir="${build}"/> - </target> - - <target name="generate"> - <exec executable="../../compiler/cpp/thrift"> - <arg line="--gen java:hashcode ../ThriftTest.thrift" /> - </exec> - <exec executable="../../compiler/cpp/thrift"> - <arg line="--gen java:hashcode ../DebugProtoTest.thrift" /> - </exec> - <exec executable="../../compiler/cpp/thrift"> - <arg line="--gen java:hashcode ../OptionalRequiredTest.thrift" /> - </exec> - <exec executable="../../compiler/cpp/thrift"> - <arg line="--gen java:beans,nocamel ../JavaBeansTest.thrift" /> - </exec> - </target> - - <target name="compileonly"> - <javac debug="true" srcdir="${gen}" destdir="${build}" classpath="${cpath}" /> - <javac debug="true" srcdir="${genbean}" destdir="${build}" classpath="${cpath}" /> - <javac debug="true" srcdir="${src}" destdir="${build}" classpath="${cpath}:${gen}" /> - </target> - - <target name="compile" depends="init,generate,compileonly"> - <jar jarfile="${testjar}" basedir="${build}"/> - </target> - - <target name="test" depends="compile"> - <java classname="org.apache.thrift.test.JSONProtoTest" - classpath="${cpath}:${testjar}:${gen}" failonerror="true" /> - <java classname="org.apache.thrift.test.IdentityTest" - classpath="${cpath}:${testjar}:${gen}" failonerror="true" /> - <java classname="org.apache.thrift.test.EqualityTest" - classpath="${cpath}:${testjar}:${gen}" failonerror="true" /> - <java classname="org.apache.thrift.test.ToStringTest" - classpath="${cpath}:${testjar}:${gen}" failonerror="true" /> - <java classname="org.apache.thrift.test.DeepCopyTest" - classpath="${cpath}:${testjar}:${gen}" failonerror="true" /> - <java classname="org.apache.thrift.test.JavaBeansTest" - classpath="${cpath}:${testjar}:${gen}" failonerror="true" /> - </target> - - <target name="clean"> - <delete dir="gen-java" /> - <delete dir="gen-javabean" /> - <delete dir="${build}" /> - <delete file="thrifttest.jar" /> - </target> - -</project> |