diff options
Diffstat (limited to 'tools/run_tests.sh')
| -rwxr-xr-x | tools/run_tests.sh | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/tools/run_tests.sh b/tools/run_tests.sh index 2f4aae3..12e3707 100755 --- a/tools/run_tests.sh +++ b/tools/run_tests.sh @@ -3,19 +3,16 @@ # reserved. Use of this source code is governed by a BSD-style license # that can be found in the LICENSE file. -echo "Usage: " -cd .. - if [ -z "$1" ]; then echo "ERROR: Please specify a target platform: linux32 | linux64 | macos" else if [ -z "$2" ]; then echo "ERROR: Please specify a build type: Debug or Release" else - export OUT_PATH="./out/$1" + DIR="$( cd "$( dirname "$0" )" && cd .. && pwd )" + OUT_PATH="${DIR}/out/$1" - #export LIB_PATH=$(readlink -f "./jcef_build/native/$2") - export LIB_PATH=`pwd`/jcef_build/native/$2 + export LIB_PATH=$(readlink -f "./jcef_build/native/$2") if [ ! -d "$LIB_PATH" ]; then echo "ERROR: Native build output path does not exist" exit 1 @@ -25,16 +22,21 @@ else export OUT_PATH=$LIB_PATH fi - export CLS_PATH="./third_party/jogamp/jar/*:$OUT_PATH" + export CLS_PATH="${DIR}/third_party/jogamp/jar/*:$OUT_PATH" # Necessary for jcef_helper to find libcef.so. - #export LD_LIBRARY_PATH=$LIB_PATH + #if [ -n "$LD_LIBRARY_PATH" ]; then + # LD_LIBRARY_PATH="$LIB_PATH:${LD_LIBRARY_PATH}" + #else + # LD_LIBRARY_PATH="$LIB_PATH" + #fi + #export LD_LIBRARY_PATH # Remove the first two params ($1 and $2) and pass the rest to java. shift shift - #LD_PRELOAD=$LIB_PATH/libcef.so java -Djava.library.path=$LIB_PATH -jar ./third_party/junit/junit-platform-console-standalone-*.jar -cp $OUT_PATH --select-package tests.junittests "$@" + #LD_PRELOAD=libcef.so java -Djava.library.path="$LIB_PATH" -jar "${DIR}"/third_party/junit/junit-platform-console-standalone-*.jar -cp "$OUT_PATH" --select-package tests.junittests "$@" echo "TEST_JAVA_HOME=$TEST_JAVA_HOME" if [ ! -d "$TEST_JAVA_HOME" ]; then |