Skip to content

Commit c7787a9

Browse files
authored
Merge pull request #347 from youngsofun/fix
fix test_compatibility.sh
2 parents 649c29e + 7eef0ea commit c7787a9

File tree

1 file changed

+9
-8
lines changed

1 file changed

+9
-8
lines changed

tests/compatibility/test_compatibility.sh

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@ curl -sSLfo ./jcommander.jar https://repo1.maven.org/maven2/org/jcommander/jcomm
88
curl -sSLfo ./jts-core.jar https://repo1.maven.org/maven2/org/locationtech/jts/jts-core/1.19.0/jts-core-1.19.0.jar
99
curl -sSLfo ./slf4j-api.jar https://repo1.maven.org/maven2/org/slf4j/slf4j-api/2.0.16/slf4j-api-2.0.16.jar
1010

11-
12-
1311
original_dir=$(pwd)
1412
cd ../..
1513
# got 1 if not in java project
@@ -20,18 +18,21 @@ TEST_SIDE=${TEST_SIDE:-server}
2018
TEST_VER=${DATABEND_JDB_TEST_VERSION:-$CURRENT_VERSION}
2119
JDBC_VER=${DATABEND_JDBC_VERSION:-$CURRENT_VERSION}
2220

21+
JDBC_JAR="databend-jdbc-${JDBC_VER}.jar"
22+
JDBC_TEST_JAR="databend-jdbc-${TEST_VER}-tests.jar"
23+
2324
if [ "$TEST_SIDE" = "server" ]; then
24-
curl -sSLfo ./databend-jdbc-tests.jar "https://github.com/databendlabs/databend-jdbc/releases/download/v${TEST_VER}/databend-jdbc-${TEST_VER}-tests.jar"
25+
curl -sSLfO "https://github.com/databendlabs/databend-jdbc/releases/download/v${TEST_VER}/${JDBC_TEST_JAR}"
2526
else
26-
cp ../../databend-jdbc/target/databend-jdbc-${TEST_VER}-tests.jar databend-jdbc-tests.jar
27+
cp "../../databend-jdbc/target/${JDBC_TEST_JAR}" .
2728
fi
2829

2930
if [ -z "DATABEND_JDBC_VERSION" ]; then
30-
# only for dev
31-
cp ../../databend-jdbc/target/databend-jdbc-${JDBC_VER}.jar databend-jdbc.jar
31+
# test main branch
32+
cp "../../databend-jdbc/target/${JDBC_JAR}" .
3233
else
33-
curl -sSLfo "./databend-jdbc-${JDBC_VER}.jar" "https://github.com/databendlabs/databend-jdbc/releases/download/v${JDBC_VER}/databend-jdbc-${JDBC_VER}.jar"
34+
curl -sSLfO "https://github.com/databendlabs/databend-jdbc/releases/download/v${JDBC_VER}/${JDBC_JAR}"
3435
fi
3536

3637
export DATABEND_JDBC_VERSION=$JDBC_VER
37-
java -Dlogback.logger.root=INFO -cp "testng.jar:slf4j-api.jar:databend-jdbc-${JDBC_VER}.jar:databend-jdbc-tests.jar:jcommander.jar:semver4j.jar" org.testng.TestNG testng.xml
38+
java -Dlogback.logger.root=INFO -cp "testng.jar:slf4j-api.jar:${JDBC_JAR}:${JDBC_TEST_JAR}:jcommander.jar:semver4j.jar" org.testng.TestNG testng.xml

0 commit comments

Comments
 (0)