Author: roger
Date: Thu Mar 17 19:13:36 2011
New Revision: 1082649
URL: http://svn.apache.org/viewvc?rev=1082649&view=rev
Log:
THRIFT-1091 integrate JavaScript Test into Testsuite via make check
Added:
thrift/trunk/lib/js/test/Makefile.am (with props)
Modified:
thrift/trunk/configure.ac
thrift/trunk/lib/Makefile.am
thrift/trunk/lib/js/ (props changed)
thrift/trunk/lib/js/test/build.xml
Modified: thrift/trunk/configure.ac
URL:
http://svn.apache.org/viewvc/thrift/trunk/configure.ac?rev=1082649&r1=1082648&r2=1082649&view=diff
==============================================================================
--- thrift/trunk/configure.ac (original)
+++ thrift/trunk/configure.ac Thu Mar 17 19:13:36 2011
@@ -468,6 +468,7 @@ AC_CONFIG_FILES([
lib/erl/src/Makefile
lib/hs/Makefile
lib/java/Makefile
+ lib/js/test/Makefile
lib/perl/Makefile
lib/perl/test/Makefile
lib/php/Makefile
Modified: thrift/trunk/lib/Makefile.am
URL:
http://svn.apache.org/viewvc/thrift/trunk/lib/Makefile.am?rev=1082649&r1=1082648&r2=1082649&view=diff
==============================================================================
--- thrift/trunk/lib/Makefile.am (original)
+++ thrift/trunk/lib/Makefile.am Thu Mar 17 19:13:36 2011
@@ -33,6 +33,9 @@ endif
if WITH_JAVA
SUBDIRS += java
+# JavaScript unit test depends on java
+# so test only if java, ant & co is available
+SUBDIRS += js/test
endif
if WITH_PYTHON
Propchange: thrift/trunk/lib/js/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Mar 17 19:13:36 2011
@@ -0,0 +1,2 @@
+Makefile
+Makefile.in
Added: thrift/trunk/lib/js/test/Makefile.am
URL:
http://svn.apache.org/viewvc/thrift/trunk/lib/js/test/Makefile.am?rev=1082649&view=auto
==============================================================================
--- thrift/trunk/lib/js/test/Makefile.am (added)
+++ thrift/trunk/lib/js/test/Makefile.am Thu Mar 17 19:13:36 2011
@@ -0,0 +1,29 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+export CLASSPATH
+
+# Make sure this doesn't fail if ant is not configured.
+clean-local:
+ ANT=$(ANT) ; if test -z "$$ANT" ; then ANT=: ; fi ; \
+ $$ANT $(ANT_FLAGS) clean
+
+check-local: all
+ $(ANT) $(ANT_FLAGS) test
+
Propchange: thrift/trunk/lib/js/test/Makefile.am
------------------------------------------------------------------------------
svn:executable = *
Modified: thrift/trunk/lib/js/test/build.xml
URL:
http://svn.apache.org/viewvc/thrift/trunk/lib/js/test/build.xml?rev=1082649&r1=1082648&r2=1082649&view=diff
==============================================================================
--- thrift/trunk/lib/js/test/build.xml (original)
+++ thrift/trunk/lib/js/test/build.xml Thu Mar 17 19:13:36 2011
@@ -103,7 +103,7 @@
<jar jarfile="${jar.file}" basedir="${build}"/>
</target>
- <target name="test" description="run the test server" depends="jstest">
+ <target name="testserver" description="run the test server" depends="jstest">
<java classname="test.Httpd" fork="true"
classpathref="test.classpath" failonerror="true">
<arg value="../" />
@@ -119,7 +119,10 @@
</exec>
</target>
- <target name="lint" description="code quality checks" depends="gjslint,
jslint"/>
+ <!-- @TODO QUnit tests as part of the testsuite-->
+ <target name="test" description="run test suite" depends="init, generate,
resolve, lint"/>
+
+ <target name="lint" description="code quality checks" depends="gjslint,
jslint, generate"/>
<target name="jslint">
<!--
