Skip to content

Commit cd554fe

Browse files
committed
Limit Derby external test to startup verification
Replace full junit-all test suite with startup-only verification using Derby's built-in sysinfo tool. The sysinfo command exercises JVM launch, Derby class loading, and runtime reflection without running Derby's own application-level unit tests. Also fix pre-existing bash syntax bug: 'export var value' (without =) does not assign the variable in bash; corrected to 'export var=value'. - external/derby/test.sh: remove ant junit-all; fix export syntax; run java -jar derbyrun.jar sysinfo as the startup signal - external/derby/playlist.xml: add derby_startup_test at extended level; demote derby_test_junit_all to special level (on-demand only)
1 parent a179181 commit cd554fe

3 files changed

Lines changed: 23 additions & 18 deletions

File tree

external/derby/playlist.xml

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
-->
1515
<playlist xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../TKG/resources/playlist.xsd">
1616
<test>
17-
<testCaseName>derby_test_junit_all</testCaseName>
17+
<testCaseName>derby_startup_test</testCaseName>
1818
<command> $(TEST_ROOT)$(D)external$(D)external.sh --run --tag "${DOCKERIMAGE_TAG}" --dir derby --reportdst $(REPORTDIR) --docker_args "$(EXTRA_DOCKER_ARGS)" ; \
1919
$(TEST_STATUS); \
2020
$(TEST_ROOT)$(D)external$(D)external.sh --clean --tag "${DOCKERIMAGE_TAG}" --dir derby
@@ -29,4 +29,20 @@
2929
<group>external</group>
3030
</groups>
3131
</test>
32+
<test>
33+
<testCaseName>derby_test_junit_all</testCaseName>
34+
<command> $(TEST_ROOT)$(D)external$(D)external.sh --run --tag "${DOCKERIMAGE_TAG}" --dir derby --reportdst $(REPORTDIR) --docker_args "$(EXTRA_DOCKER_ARGS)" ; \
35+
$(TEST_STATUS); \
36+
$(TEST_ROOT)$(D)external$(D)external.sh --clean --tag "${DOCKERIMAGE_TAG}" --dir derby
37+
</command>
38+
<levels>
39+
<level>special</level>
40+
</levels>
41+
<versions>
42+
<version>9+</version>
43+
</versions>
44+
<groups>
45+
<group>external</group>
46+
</groups>
47+
</test>
3248
</playlist>

external/derby/test.sh

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -15,22 +15,16 @@
1515
source $(dirname "$0")/test_base_functions.sh
1616
#Set up Java to be used by the derby test
1717
echo_setup
18-
#clean previous build artifacts
18+
#clean previous build artifacts
1919
ant -f build.xml clobber
2020
#build all
2121
ant -f build.xml all
2222
#create jars
2323
ant -f build.xml buildjars
2424

25-
export jardir ${TEST_HOME}/jars/sane
26-
export tstjardir ${TEST_HOME}/tools/java
27-
export CLASSPATH "${jardir}/derbyrun.jar:${jardir}/derbyTesting.jar:${tstjardir}/junit.jar"
28-
java -jar ${TEST_HOME}/jars/sane/derbyrun.jar sysinfo
25+
export jardir="${TEST_HOME}/jars/sane"
26+
export tstjardir="${TEST_HOME}/tools/java"
27+
export CLASSPATH="${jardir}/derbyrun.jar:${jardir}/derbyTesting.jar:${tstjardir}/junit.jar"
2928

3029
set -e
31-
#Run all tests
32-
ant -Dderby.tests.basePort=1690 -Dderby.system.durability=test -DderbyTesting.oldReleasePath=${TEST_HOME}/jars junit-all
33-
set +e
34-
#Run only derbylang suite
35-
#java -Dverbose=true -cp ${jardir}/derbyrun.jar:${jardir}/derbyTesting.jar:$tstjardir/junit.jar org.apache.derbyTesting.functionTests.harness.RunSuite #derbylang
36-
30+
java -jar "${TEST_HOME}/jars/sane/derbyrun.jar" sysinfo

external/tomcat/test.sh

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -48,12 +48,11 @@ TOMCAT_URL="${TOMCAT_URL:-http://localhost:8080/}"
4848
TOMCAT_BUILD_DIR="${TEST_HOME}/output/build"
4949

5050
cleanup() {
51-
echo "Stopping Tomcat"
5251
"${TOMCAT_BUILD_DIR}/bin/catalina.sh" stop || true
5352
}
5453
trap cleanup EXIT
5554

56-
echo "Starting Tomcat from ${TOMCAT_BUILD_DIR}"
55+
echo "Starting Tomcat"
5756
cd "${TOMCAT_BUILD_DIR}"
5857
bin/catalina.sh start
5958

@@ -63,10 +62,6 @@ if timeout "${STARTUP_TIMEOUT}" bash -c "until curl -sf '${TOMCAT_URL}' >/dev/nu
6362
exit 0
6463
else
6564
echo "Tomcat startup verification FAILED"
66-
echo "Tomcat did not respond within ${STARTUP_TIMEOUT} seconds"
67-
echo "==== catalina.out ===="
6865
tail -n 200 logs/catalina.out || true
69-
echo "==== Tomcat logs directory ===="
70-
ls -la logs || true
7166
exit 1
7267
fi

0 commit comments

Comments
 (0)