make sure the junit tests still work
git-svn-id: http://google-refine.googlecode.com/svn/trunk@405 7d457c2a-affb-35e4-300a-418c747d4874
This commit is contained in:
parent
341a8d3f8f
commit
6114530723
@ -22,6 +22,6 @@
|
||||
<classpathentry kind="lib" path="lib/poi-ooxml-3.6.jar"/>
|
||||
<classpathentry kind="lib" path="lib/jython-2.5.1.jar"/>
|
||||
<classpathentry kind="lib" path="lib/clojure-1.1.0.jar"/>
|
||||
<classpathentry kind="lib" path="tests/lib/junit-4.8.1.jar" sourcepath="tests/lib-src/junit-4.8.1-sources.jar"/>
|
||||
<classpathentry kind="lib" path="tests/java/lib/junit-4.8.1.jar" sourcepath="tests/java/lib-src/junit-4.8.1-sources.jar"/>
|
||||
<classpathentry kind="output" path="src/main/webapp/WEB-INF/classes"/>
|
||||
</classpath>
|
||||
|
@ -26,7 +26,7 @@
|
||||
<property name="graphics.dir" value="${basedir}/src/graphics" />
|
||||
<property name="conf.dir" value="${basedir}/src/conf" />
|
||||
<property name="lib.dir" value="${basedir}/lib" />
|
||||
<property name="tests.dir" value="${basedir}/tests" />
|
||||
<property name="tests.dir" value="${basedir}/tests/java" />
|
||||
<property name="tools.dir" value="${basedir}/tools" />
|
||||
|
||||
<property name="server_classes.dir" value="${build.dir}/classes" />
|
||||
|
@ -347,17 +347,17 @@ ui_test() {
|
||||
}
|
||||
|
||||
server_test() {
|
||||
if [ ! -d $GRIDWORKS_TEST_DIR/classes ] ; then
|
||||
if [ ! -d $GRIDWORKS_TEST_DIR/java/classes ] ; then
|
||||
ant build_tests
|
||||
echo ""
|
||||
fi
|
||||
|
||||
CLASSPATH="$GRIDWORKS_BUILD_DIR/classes:$GRIDWORKS_TEST_DIR/classes:$GRIDWORKS_TEST_DIR/lib/*:$GRIDWORKS_LIB_DIR/*"
|
||||
CLASSPATH="$GRIDWORKS_BUILD_DIR/classes:$GRIDWORKS_WEBAPP/WEB-INF/classes:$GRIDWORKS_TEST_DIR/java/classes:$GRIDWORKS_TEST_DIR/java/lib/*:$GRIDWORKS_LIB_DIR/*:$GRIDWORKS_WEBAPP/WEB-INF/lib/*"
|
||||
|
||||
if [ "$1" == "" ] ; then
|
||||
cd $GRIDWORKS_TEST_DIR/classes
|
||||
cd $GRIDWORKS_TEST_DIR/java/classes
|
||||
TESTS=`find . -name '*.class' | sed s@/@.@g | sed s@.class@@ | sed s@..@@`
|
||||
cd ../..
|
||||
cd ../../..
|
||||
else
|
||||
TESTS=$1
|
||||
fi
|
||||
|
Loading…
Reference in New Issue
Block a user