diff options
| author | Arnstein Ressem <aressem@verizonmedia.com> | 2020-08-31 21:44:14 +0000 |
|---|---|---|
| committer | Arnstein Ressem <aressem@verizonmedia.com> | 2020-08-31 21:44:14 +0000 |
| commit | bd878fa4d763caa664078ef9732425b7cc1ae850 (patch) | |
| tree | 64837f6d382c66d89b5e1b316f407f3df565aa6b /jrt_test | |
| parent | f6792aac5a511e0e67cb5fe1c989bff4c786cbab (diff) | |
Make it possible to pick up jars needed for cpp tests from alternative location.
Diffstat (limited to 'jrt_test')
| -rwxr-xr-x | jrt_test/src/binref/compilejava.in | 12 | ||||
| -rwxr-xr-x | jrt_test/src/binref/runjava.in | 15 |
2 files changed, 22 insertions, 5 deletions
diff --git a/jrt_test/src/binref/compilejava.in b/jrt_test/src/binref/compilejava.in index c294a263641..312d05c7a1e 100755 --- a/jrt_test/src/binref/compilejava.in +++ b/jrt_test/src/binref/compilejava.in @@ -1,10 +1,18 @@ #!/bin/sh # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. unset VESPA_LOG_TARGET -CLASSPATH=@PROJECT_SOURCE_DIR@/jrt/target/jrt.jar -CLASSPATH=$CLASSPATH:@PROJECT_SOURCE_DIR@/vespajlib/target/vespajlib.jar + +if [ -n $VESPA_CPP_TEST_JARS ]; then + CLASSPATH=$VESPA_CPP_TEST_JARS/jrt.jar + CLASSPATH=$CLASSPATH:$VESPA_CPP_TEST_JARS/vespajlib.jar +else + CLASSPATH=@PROJECT_SOURCE_DIR@/jrt/target/jrt.jar + CLASSPATH=$CLASSPATH:@PROJECT_SOURCE_DIR@/vespajlib/target/vespajlib.jar +fi + CLASSPATH=$CLASSPATH:@CMAKE_CURRENT_SOURCE_DIR@/../java/classes CLASSPATH=$CLASSPATH:. + if [ $# -lt 1 ]; then echo "usage: compilejava file ..." exit 1 diff --git a/jrt_test/src/binref/runjava.in b/jrt_test/src/binref/runjava.in index 7c4c299b488..2a3c69e0e36 100755 --- a/jrt_test/src/binref/runjava.in +++ b/jrt_test/src/binref/runjava.in @@ -1,11 +1,20 @@ #!/bin/sh # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. unset VESPA_LOG_TARGET -CLASSPATH=@PROJECT_SOURCE_DIR@/jrt/target/jrt.jar -CLASSPATH=$CLASSPATH:@PROJECT_SOURCE_DIR@/vespajlib/target/vespajlib.jar -CLASSPATH=$CLASSPATH:@PROJECT_SOURCE_DIR@/security-utils/target/security-utils.jar + +if [ -n $VESPA_CPP_TEST_JARS ]; then + CLASSPATH=$VESPA_CPP_TEST_JARS/jrt.jar + CLASSPATH=$CLASSPATH:$VESPA_CPP_TEST_JARS/vespajlib.jar + CLASSPATH=$CLASSPATH:@PROJECT_SOURCE_DIR@/security-utils/target/security-utils.jar +else + CLASSPATH=@PROJECT_SOURCE_DIR@/jrt/target/jrt.jar + CLASSPATH=$CLASSPATH:@PROJECT_SOURCE_DIR@/vespajlib/target/vespajlib.jar + CLASSPATH=$CLASSPATH:@PROJECT_SOURCE_DIR@/security-utils/target/security-utils.jar +fi + CLASSPATH=$CLASSPATH:@CMAKE_CURRENT_SOURCE_DIR@/../java/classes CLASSPATH=$CLASSPATH:. + if [ $# -lt 1 ]; then echo "usage: runjava <class> [args]" exit 1 |