diff options
| author | Arnstein Ressem <aressem@gmail.com> | 2016-08-29 10:03:05 +0200 |
|---|---|---|
| committer | Vegard Sjonfjell <vegardsjo@gmail.com> | 2016-08-29 10:03:05 +0200 |
| commit | 0afe8142ad7a5dc374fd6dc943695b407138ad6d (patch) | |
| tree | 3220ca6366abc2ffac876ba7291d52d0586c88b8 /jrt_test/src/tests | |
| parent | fdc4a46d3554a165322b37f5416894c86d61c7f3 (diff) | |
Aressem/cmake workaround clion not copying links properly (#479)
* Implemented workaround for CLion not able to copy symlinks.
* Get rid of the links
Diffstat (limited to 'jrt_test/src/tests')
| -rw-r--r-- | jrt_test/src/tests/rpc-error/progdefs.sh | 2 | ||||
| -rwxr-xr-x | jrt_test/src/tests/slobrok-api/dotest.sh | 2 | ||||
| -rw-r--r-- | jrt_test/src/tests/slobrok-api/progdefs.sh | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/jrt_test/src/tests/rpc-error/progdefs.sh b/jrt_test/src/tests/rpc-error/progdefs.sh index 815aa5a960e..c7425f18bd9 100644 --- a/jrt_test/src/tests/rpc-error/progdefs.sh +++ b/jrt_test/src/tests/rpc-error/progdefs.sh @@ -1,3 +1,3 @@ # Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -prog cppserver 1 "tcp/$CPP_PORT" "$BINREF/simpleserver" +prog cppserver 1 "tcp/$CPP_PORT" "$SIMPLESERVER" prog javaserver 1 "tcp/$JAVA_PORT" "$BINREF/runjava SimpleServer" diff --git a/jrt_test/src/tests/slobrok-api/dotest.sh b/jrt_test/src/tests/slobrok-api/dotest.sh index d5a4a35647e..e413d774e1b 100755 --- a/jrt_test/src/tests/slobrok-api/dotest.sh +++ b/jrt_test/src/tests/slobrok-api/dotest.sh @@ -8,7 +8,7 @@ fail=0 export PORT_8 $BINREF/progctl.sh progdefs.sh start slobrok 1 $BINREF/runjava SlobrokAPITest tcp/localhost:${PORT_8} || fail=1 -$BINREF/sbcmd ${PORT_8} slobrok.system.stop +$SBCMD ${PORT_8} slobrok.system.stop $BINREF/progctl.sh progdefs.sh stop slobrok 1 exit $fail diff --git a/jrt_test/src/tests/slobrok-api/progdefs.sh b/jrt_test/src/tests/slobrok-api/progdefs.sh index af694ab8ad4..3cc4ef3a340 100644 --- a/jrt_test/src/tests/slobrok-api/progdefs.sh +++ b/jrt_test/src/tests/slobrok-api/progdefs.sh @@ -1,2 +1,2 @@ # Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -prog slobrok 1 "-p $PORT_8" +prog slobrok 1 "-p $PORT_8" $SLOBROK |