Aressem/cmake workaround clion not copying links properly (#479)

* Implemented workaround for CLion not able to copy symlinks.

* Get rid of the links

8 files changed, 7 insertions, 10 deletions

diff --git a/jrt_test/src/binref/CMakeLists.txt b/jrt_test/src/binref/CMakeLists.txt
index 3abbdee7aed..2a13e81355a 100644
--- a/jrt_test/src/binref/CMakeLists.txt
+++ b/jrt_test/src/binref/CMakeLists.txt
@@ -4,6 +4,3 @@ configure_file(compilejava.in compilejava @ONLY)
 configure_file(runjava.in runjava @ONLY)
 configure_file(env.sh.in env.sh @ONLY)
 
-if (NOT ${CMAKE_CURRENT_BINARY_DIR} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR})
-    file(COPY sbcmd simpleserver slobrok DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
-endif()
diff --git a/jrt_test/src/binref/env.sh.in b/jrt_test/src/binref/env.sh.in
index 86c1efbb2aa..6549af72454 100644
--- a/jrt_test/src/binref/env.sh.in
+++ b/jrt_test/src/binref/env.sh.in
@@ -1,5 +1,8 @@
 BINREF=@CMAKE_CURRENT_BINARY_DIR@
-export BINREF
+SBCMD=@PROJECT_BINARY_DIR@/slobrok/src/apps/sbcmd/sbcmd
+SLOBROK=@PROJECT_BINARY_DIR@/slobrok/src/apps/slobrok/slobrok
+SIMPLESERVER=@PROJECT_BINARY_DIR@/jrt_test/src/jrt-test/simpleserver/jrt_test_simpleserver_app
+export BINREF SBCMD SLOBROK SIMPLESERVER
 # port numbers allocated for this module:
 PORT_0=18230
 PORT_1=18231
diff --git a/jrt_test/src/binref/sbcmd b/jrt_test/src/binref/sbcmd
deleted file mode 120000
index a1cd73591a5..00000000000
--- a/jrt_test/src/binref/sbcmd
+++ /dev/null
@@ -1 +0,0 @@
-../../../slobrok/src/apps/sbcmd/sbcmd
\ No newline at end of file
diff --git a/jrt_test/src/binref/simpleserver b/jrt_test/src/binref/simpleserver
deleted file mode 120000
index 7f1f746f093..00000000000
--- a/jrt_test/src/binref/simpleserver
+++ /dev/null
@@ -1 +0,0 @@
-../../../jrt_test/src/jrt-test/simpleserver/jrt_test_simpleserver_app
\ No newline at end of file
diff --git a/jrt_test/src/binref/slobrok b/jrt_test/src/binref/slobrok
deleted file mode 120000
index 77dae12a032..00000000000
--- a/jrt_test/src/binref/slobrok
+++ /dev/null
@@ -1 +0,0 @@
-../../../slobrok/src/apps/slobrok/slobrok
\ No newline at end of file
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