Skip to content

Commit abb32ac

Browse files
committed
Fix build order in Tomcat full branch
1 parent 1226f08 commit abb32ac

1 file changed

Lines changed: 5 additions & 2 deletions

File tree

external/tomcat/test.sh

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@ source $(dirname "$0")/test_base_functions.sh
1616
echo_setup
1717

1818
set -e
19-
echo "Building tomcat"
20-
ant
2119

2220
if [ "$1" = "full" ]; then
2321
git clone -q -b 1.6.x --single-branch https://github.com/apache/apr.git $TEST_HOME/tmp/apr
@@ -43,8 +41,13 @@ if [ "$1" = "full" ]; then
4341
echo "test.openssl.path=/dev/null/openssl" >> build.properties
4442
echo "test.apr.loc=$TEST_HOME/tmp/tomcat-native-build/lib" >> build.properties
4543

44+
echo "Building tomcat"
45+
ant
4646
ant test
4747
else
48+
echo "Building tomcat"
49+
ant
50+
4851
TOMCAT_BUILD_DIR="${TEST_HOME}/output/build"
4952

5053
cleanup() {

0 commit comments

Comments
 (0)