diff options
| author | tmartins <thigm85@gmail.com> | 2020-09-01 19:36:05 +0200 |
|---|---|---|
| committer | tmartins <thigm85@gmail.com> | 2020-09-01 19:36:05 +0200 |
| commit | b32126c1383cd3c12e64096e329252748bd7f644 (patch) | |
| tree | 99d6a4211a5acd9d2a6579ea4f9e28efbb1fb4c3 /jrt_test/src/binref/runjava.in | |
| parent | 4772c87da9ac3350d9c28291e76c17ec576f1fbf (diff) | |
| parent | 1838608019b8004a6a86c6b6c530a60bc151f633 (diff) | |
Merge branch 'master' into tgm/reference-doc
Diffstat (limited to 'jrt_test/src/binref/runjava.in')
| -rwxr-xr-x | jrt_test/src/binref/runjava.in | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/jrt_test/src/binref/runjava.in b/jrt_test/src/binref/runjava.in index 7c4c299b488..47e7b8aa66c 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:$VESPA_CPP_TEST_JARS/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 |