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 /messagebus_test | |
| parent | f6792aac5a511e0e67cb5fe1c989bff4c786cbab (diff) | |
Make it possible to pick up jars needed for cpp tests from alternative location.
Diffstat (limited to 'messagebus_test')
| -rwxr-xr-x | messagebus_test/src/binref/compilejava.in | 11 | ||||
| -rwxr-xr-x | messagebus_test/src/binref/runjava.in | 12 |
2 files changed, 19 insertions, 4 deletions
diff --git a/messagebus_test/src/binref/compilejava.in b/messagebus_test/src/binref/compilejava.in index da5414e3ce4..b7c76f862a0 100755 --- a/messagebus_test/src/binref/compilejava.in +++ b/messagebus_test/src/binref/compilejava.in @@ -1,8 +1,15 @@ #!/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@/messagebus/target/messagebus-jar-with-dependencies.jar -CLASSPATH=$CLASSPATH:@PROJECT_SOURCE_DIR@/component/target/component.jar + +if [ -n $VESPA_CPP_TEST_JARS ]; then + CLASSPATH=$VESPA_CPP_TEST_JARS/messagebus-jar-with-dependencies.jar + CLASSPATH=$CLASSPATH:$VESPA_CPP_TEST_JARS/component.jar +else + CLASSPATH=@PROJECT_SOURCE_DIR@/messagebus/target/messagebus-jar-with-dependencies.jar + CLASSPATH=$CLASSPATH:@PROJECT_SOURCE_DIR@/component/target/component.jar +fi + CLASSPATH=$CLASSPATH:. if [ $# -lt 1 ]; then diff --git a/messagebus_test/src/binref/runjava.in b/messagebus_test/src/binref/runjava.in index c75e4d5cbc1..14540615ae6 100755 --- a/messagebus_test/src/binref/runjava.in +++ b/messagebus_test/src/binref/runjava.in @@ -2,9 +2,17 @@ # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. unset VESPA_LOG_TARGET unset LD_PRELOAD -CLASSPATH=@PROJECT_SOURCE_DIR@/messagebus/target/messagebus-jar-with-dependencies.jar -CLASSPATH=$CLASSPATH:@PROJECT_SOURCE_DIR@/component/target/component.jar + +if [ -n $VESPA_CPP_TEST_JARS ]; then + CLASSPATH=$VESPA_CPP_TEST_JARS/messagebus-jar-with-dependencies.jar + CLASSPATH=$CLASSPATH:$VESPA_CPP_TEST_JARS/component.jar +else + CLASSPATH=@PROJECT_SOURCE_DIR@/messagebus/target/messagebus-jar-with-dependencies.jar + CLASSPATH=$CLASSPATH:@PROJECT_SOURCE_DIR@/component/target/component.jar +fi + CLASSPATH=$CLASSPATH:. + if [ $# -lt 1 ]; then echo "usage: runjava <class> [args]" exit 1 |