From 55e5a91901109161186e05d3a6e959e06958bbba Mon Sep 17 00:00:00 2001
From: Arnstein Ressem <aressem@gmail.com>
Date: Tue, 23 Aug 2016 15:10:36 +0200
Subject: Aressem/cmake more out of source tests (#441)

* vespalib tests run out of source.

* staging_vespalib run tests out of source.

* fastos tests run out of source.

* Fixed storage tests out of source.

* Fixed some of the config tests.

* config* tests run out of source.

* document_* tests run out of source.

* documentapi_ tests run out of source.

* Fixed fsa out of source tests.

* Fix jrt_test out of source.

* More tests run out of source.

* Fix some slobrok and messagebus tests.

* More fixes for out of source tests.

* Done with first pass of regular tests out of source.

* Only use SOURCE_DIRECTORY in a limited set of places.

* Fix some remaining tests.

* Some cleanups.

* No need for extra slash.
---
 jrt_test/src/binref/CMakeLists.txt                           |  4 ++++
 jrt_test/src/binref/runjava.in                               |  4 ++--
 jrt_test/src/tests/echo/CMakeLists.txt                       |  2 +-
 jrt_test/src/tests/echo/dotest.sh                            | 10 ++++++----
 jrt_test/src/tests/echo/echo_test.sh                         |  9 +++++++--
 jrt_test/src/tests/mandatory-methods/CMakeLists.txt          |  2 +-
 jrt_test/src/tests/mandatory-methods/dotest.sh               | 10 +++++++---
 .../src/tests/mandatory-methods/mandatory-methods_test.sh    | 10 +++++++---
 jrt_test/src/tests/mockup-invoke/CMakeLists.txt              |  2 +-
 jrt_test/src/tests/mockup-invoke/dotest.sh                   | 10 +++++++---
 jrt_test/src/tests/mockup-invoke/mockup-invoke_test.sh       | 10 +++++++---
 jrt_test/src/tests/rpc-error/CMakeLists.txt                  |  2 +-
 jrt_test/src/tests/rpc-error/dotest.sh                       | 12 ++++++++----
 jrt_test/src/tests/rpc-error/rpc-error_test.sh               | 10 +++++++---
 14 files changed, 66 insertions(+), 31 deletions(-)

(limited to 'jrt_test')

diff --git a/jrt_test/src/binref/CMakeLists.txt b/jrt_test/src/binref/CMakeLists.txt
index 20594f98d02..3abbdee7aed 100644
--- a/jrt_test/src/binref/CMakeLists.txt
+++ b/jrt_test/src/binref/CMakeLists.txt
@@ -3,3 +3,7 @@
 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/runjava.in b/jrt_test/src/binref/runjava.in
index 5cbc6ba4988..5f3a5addd7e 100755
--- a/jrt_test/src/binref/runjava.in
+++ b/jrt_test/src/binref/runjava.in
@@ -1,7 +1,7 @@
 #!/bin/sh
 unset VESPA_LOG_TARGET
-CLASSPATH=@PROJECT_BINARY_DIR@/jrt/target/jrt.jar
-CLASSPATH=$CLASSPATH:@PROJECT_BINARY_DIR@/vespajlib/target/vespajlib.jar
+CLASSPATH=@PROJECT_SOURCE_DIR@/jrt/target/jrt.jar
+CLASSPATH=$CLASSPATH:@PROJECT_SOURCE_DIR@/vespajlib/target/vespajlib.jar
 CLASSPATH=$CLASSPATH:@CMAKE_CURRENT_SOURCE_DIR@/../java/classes
 CLASSPATH=$CLASSPATH:.
 if [ $# -lt 1 ]; then
diff --git a/jrt_test/src/tests/echo/CMakeLists.txt b/jrt_test/src/tests/echo/CMakeLists.txt
index bab581e1606..8de1ea6f842 100644
--- a/jrt_test/src/tests/echo/CMakeLists.txt
+++ b/jrt_test/src/tests/echo/CMakeLists.txt
@@ -4,4 +4,4 @@ vespa_add_executable(jrt_test_echo-client_app TEST
     echo-client.cpp
     DEPENDS
 )
-vespa_add_test(NAME jrt_test_echo-client_app NO_VALGRIND COMMAND sh echo_test.sh)
+vespa_add_test(NAME jrt_test_echo-client_app NO_VALGRIND COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/echo_test.sh)
diff --git a/jrt_test/src/tests/echo/dotest.sh b/jrt_test/src/tests/echo/dotest.sh
index 91b26c7f425..bf54fba26ca 100644
--- a/jrt_test/src/tests/echo/dotest.sh
+++ b/jrt_test/src/tests/echo/dotest.sh
@@ -1,16 +1,18 @@
 #!/bin/bash
 # Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-
+if [ -z "$SOURCE_DIRECTORY" ]; then
+    SOURCE_DIRECTORY="."
+fi
 fail=0
 
 . ../../binref/env.sh
 export PORT_2
-$BINREF/progctl.sh progdefs.sh start javaserver 1
+$SOURCE_DIRECTORY/../../binref/progctl.sh $SOURCE_DIRECTORY/progdefs.sh start javaserver 1
 $BINREF/runjava PollRPCServer tcp/localhost:$PORT_2 || fail=1
 $VALGRIND ./jrt_test_echo-client_app tcp/localhost:$PORT_2 > out.txt || fail=1
-$BINREF/progctl.sh progdefs.sh stop javaserver 1
+$SOURCE_DIRECTORY/../../binref/progctl.sh $SOURCE_DIRECTORY/progdefs.sh stop javaserver 1
 
-if diff -u out.txt ref.txt; then
+if diff -u out.txt $SOURCE_DIRECTORY/ref.txt; then
     exit $fail
 else
     exit 1
diff --git a/jrt_test/src/tests/echo/echo_test.sh b/jrt_test/src/tests/echo/echo_test.sh
index 997d8d42996..aabe3a10a25 100755
--- a/jrt_test/src/tests/echo/echo_test.sh
+++ b/jrt_test/src/tests/echo/echo_test.sh
@@ -1,6 +1,11 @@
 #!/bin/bash
+
+if [ -z "$SOURCE_DIRECTORY" ]; then
+    SOURCE_DIRECTORY="."
+fi
+
 fail=0
 . ../../binref/env.sh
-bash ./dotest.sh || fail=1
-$BINREF/progctl.sh progdefs.sh stop all
+bash $SOURCE_DIRECTORY/dotest.sh || fail=1
+$SOURCE_DIRECTORY/../../binref/progctl.sh $SOURCE_DIRECTORY/progdefs.sh stop all
 exit $fail
diff --git a/jrt_test/src/tests/mandatory-methods/CMakeLists.txt b/jrt_test/src/tests/mandatory-methods/CMakeLists.txt
index 561f19e5912..9f7665ec4b0 100644
--- a/jrt_test/src/tests/mandatory-methods/CMakeLists.txt
+++ b/jrt_test/src/tests/mandatory-methods/CMakeLists.txt
@@ -4,4 +4,4 @@ vespa_add_executable(jrt_test_extract-reflection_app TEST
     extract-reflection.cpp
     DEPENDS
 )
-vespa_add_test(NAME jrt_test_extract-reflection_app NO_VALGRIND COMMAND sh mandatory-methods_test.sh)
+vespa_add_test(NAME jrt_test_extract-reflection_app NO_VALGRIND COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/mandatory-methods_test.sh)
diff --git a/jrt_test/src/tests/mandatory-methods/dotest.sh b/jrt_test/src/tests/mandatory-methods/dotest.sh
index 8cbd99c6988..e6773456475 100644
--- a/jrt_test/src/tests/mandatory-methods/dotest.sh
+++ b/jrt_test/src/tests/mandatory-methods/dotest.sh
@@ -1,15 +1,19 @@
 #!/bin/bash
 # Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
+if [ -z "$SOURCE_DIRECTORY" ]; then
+    SOURCE_DIRECTORY="."
+fi
+
 fail=0
 
-$BINREF/progctl.sh progdefs.sh start javaserver 1 || fail=1
+$SOURCE_DIRECTORY/../../binref/progctl.sh $SOURCE_DIRECTORY/progdefs.sh start javaserver 1 || fail=1
 
 ./jrt_test_extract-reflection_app tcp/localhost:$PORT_1 verbose > out.txt || fail=1
 
-$BINREF/progctl.sh progdefs.sh stop javaserver 1 || fail=1
+$SOURCE_DIRECTORY/../../binref/progctl.sh $SOURCE_DIRECTORY/progdefs.sh stop javaserver 1 || fail=1
 
-if diff -u out.txt ref.txt; then
+if diff -u out.txt $SOURCE_DIRECTORY/ref.txt; then
     exit $fail
 else
     exit 1
diff --git a/jrt_test/src/tests/mandatory-methods/mandatory-methods_test.sh b/jrt_test/src/tests/mandatory-methods/mandatory-methods_test.sh
index c6ffbe4d3a1..ba0bc04997f 100755
--- a/jrt_test/src/tests/mandatory-methods/mandatory-methods_test.sh
+++ b/jrt_test/src/tests/mandatory-methods/mandatory-methods_test.sh
@@ -1,14 +1,18 @@
 #!/bin/bash
 
+if [ -z "$SOURCE_DIRECTORY" ]; then
+    SOURCE_DIRECTORY="."
+fi
+
 fail=0
 
 . ../../binref/env.sh
 export PORT_1
 
-$BINREF/compilejava RPCServer.java || fail=1
+$BINREF/compilejava -d . $SOURCE_DIRECTORY/RPCServer.java || fail=1
 
-bash ./dotest.sh || fail=1
+bash $SOURCE_DIRECTORY/dotest.sh || fail=1
 
-$BINREF/progctl.sh progdefs.sh stop all
+$SOURCE_DIRECTORY/../../binref/progctl.sh $SOURCE_DIRECTORY/progdefs.sh stop all
 
 exit $fail
diff --git a/jrt_test/src/tests/mockup-invoke/CMakeLists.txt b/jrt_test/src/tests/mockup-invoke/CMakeLists.txt
index 049b42a7e16..c5e484ea43c 100644
--- a/jrt_test/src/tests/mockup-invoke/CMakeLists.txt
+++ b/jrt_test/src/tests/mockup-invoke/CMakeLists.txt
@@ -4,4 +4,4 @@ vespa_add_executable(jrt_test_mockup-server_app TEST
     mockup-server.cpp
     DEPENDS
 )
-vespa_add_test(NAME jrt_test_mockup-server_app NO_VALGRIND COMMAND sh mockup-invoke_test.sh)
+vespa_add_test(NAME jrt_test_mockup-server_app NO_VALGRIND COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/mockup-invoke_test.sh)
diff --git a/jrt_test/src/tests/mockup-invoke/dotest.sh b/jrt_test/src/tests/mockup-invoke/dotest.sh
index f7fcf007c56..65796f535d4 100644
--- a/jrt_test/src/tests/mockup-invoke/dotest.sh
+++ b/jrt_test/src/tests/mockup-invoke/dotest.sh
@@ -1,9 +1,13 @@
 #!/bin/bash
 # Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
+if [ -z "$SOURCE_DIRECTORY" ]; then
+    SOURCE_DIRECTORY="."
+fi
+
 fail=0
 
-$BINREF/progctl.sh progdefs.sh start server 1
+$SOURCE_DIRECTORY/../../binref/progctl.sh $SOURCE_DIRECTORY/progdefs.sh start server 1
 
 $BINREF/runjava PollRPCServer tcp/localhost:$PORT_0 || fail=1
 $BINREF/runjava MockupInvoke tcp/localhost:$PORT_0 aaa bbb >  out.txt || fail=1
@@ -12,8 +16,8 @@ $BINREF/runjava MockupInvoke tcp/localhost:$PORT_0 ccc ddd >> out.txt || fail=1
 $BINREF/runjava MockupInvoke tcp/localhost:$PORT_0 ddd eee >> out.txt || fail=1
 $BINREF/runjava MockupInvoke tcp/localhost:$PORT_0 eee fff >> out.txt || fail=1
 
-$BINREF/progctl.sh progdefs.sh stop server 1
+$SOURCE_DIRECTORY/../../binref/progctl.sh $SOURCE_DIRECTORY/progdefs.sh stop server 1
 
-diff -u out.txt ref.txt || fail=1
+diff -u out.txt $SOURCE_DIRECTORY/ref.txt || fail=1
 
 exit $fail
diff --git a/jrt_test/src/tests/mockup-invoke/mockup-invoke_test.sh b/jrt_test/src/tests/mockup-invoke/mockup-invoke_test.sh
index 516b6abef63..dcb0666fdac 100755
--- a/jrt_test/src/tests/mockup-invoke/mockup-invoke_test.sh
+++ b/jrt_test/src/tests/mockup-invoke/mockup-invoke_test.sh
@@ -1,15 +1,19 @@
 #!/bin/bash
 
+if [ -z "$SOURCE_DIRECTORY" ]; then
+    SOURCE_DIRECTORY="."
+fi
+
 fail=0
 
 . ../../binref/env.sh
 
 export PORT_0
 
-$BINREF/compilejava MockupInvoke.java || fail=1
+$BINREF/compilejava -d . $SOURCE_DIRECTORY/MockupInvoke.java || fail=1
 
-bash ./dotest.sh || fail=1
+bash $SOURCE_DIRECTORY/dotest.sh || fail=1
 
-$BINREF/progctl.sh progdefs.sh stop all
+$SOURCE_DIRECTORY/../../binref/progctl.sh $SOURCE_DIRECTORY/progdefs.sh stop all
 
 exit $fail
diff --git a/jrt_test/src/tests/rpc-error/CMakeLists.txt b/jrt_test/src/tests/rpc-error/CMakeLists.txt
index f4756f3dffa..fbe9720d55e 100644
--- a/jrt_test/src/tests/rpc-error/CMakeLists.txt
+++ b/jrt_test/src/tests/rpc-error/CMakeLists.txt
@@ -4,4 +4,4 @@ vespa_add_executable(jrt_test_test-errors_app TEST
     test-errors.cpp
     DEPENDS
 )
-vespa_add_test(NAME jrt_test_test-errors_app NO_VALGRIND COMMAND sh rpc-error_test.sh)
+vespa_add_test(NAME jrt_test_test-errors_app NO_VALGRIND COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/rpc-error_test.sh)
diff --git a/jrt_test/src/tests/rpc-error/dotest.sh b/jrt_test/src/tests/rpc-error/dotest.sh
index df9cb4ac62a..5c68309f462 100644
--- a/jrt_test/src/tests/rpc-error/dotest.sh
+++ b/jrt_test/src/tests/rpc-error/dotest.sh
@@ -1,6 +1,10 @@
 #!/bin/bash
 # Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
+if [ -z "$SOURCE_DIRECTORY" ]; then
+    SOURCE_DIRECTORY="."
+fi
+
 fail=0
 
 . ../../binref/env.sh
@@ -12,7 +16,7 @@ CPP_PORT=$PORT_4
 export JAVA_PORT
 export CPP_PORT
 
-$BINREF/progctl.sh progdefs.sh start cppserver 1 || fail=1
+$SOURCE_DIRECTORY/../../binref/progctl.sh $SOURCE_DIRECTORY/progdefs.sh start cppserver 1 || fail=1
 $BINREF/runjava PollRPCServer tcp/localhost:$CPP_PORT || fail=1
 
 echo "CPP CLIENT <-> CPP SERVER"
@@ -21,8 +25,8 @@ echo "CPP CLIENT <-> CPP SERVER"
 echo "JAVA CLIENT <-> CPP SERVER"
 $BINREF/runjava TestErrors tcp/localhost:$CPP_PORT || fail=1
 
-$BINREF/progctl.sh progdefs.sh stop cppserver 1
-$BINREF/progctl.sh progdefs.sh start javaserver 1
+$SOURCE_DIRECTORY/../../binref/progctl.sh $SOURCE_DIRECTORY/progdefs.sh stop cppserver 1
+$SOURCE_DIRECTORY/../../binref/progctl.sh $SOURCE_DIRECTORY/progdefs.sh start javaserver 1
 $BINREF/runjava PollRPCServer tcp/localhost:$JAVA_PORT || fail=1
 
 echo "CPP CLIENT <-> JAVA SERVER"
@@ -31,7 +35,7 @@ echo "CPP CLIENT <-> JAVA SERVER"
 echo "JAVA CLIENT <-> JAVA SERVER"
 $BINREF/runjava TestErrors tcp/localhost:$JAVA_PORT || fail=1
 
-$BINREF/progctl.sh progdefs.sh stop javaserver 1
+$SOURCE_DIRECTORY/../../binref/progctl.sh $SOURCE_DIRECTORY/progdefs.sh stop javaserver 1
 
 if [ $fail = "0" ]; then
     echo "OK"
diff --git a/jrt_test/src/tests/rpc-error/rpc-error_test.sh b/jrt_test/src/tests/rpc-error/rpc-error_test.sh
index bee324273b1..c30dae9dc82 100755
--- a/jrt_test/src/tests/rpc-error/rpc-error_test.sh
+++ b/jrt_test/src/tests/rpc-error/rpc-error_test.sh
@@ -1,5 +1,9 @@
 #!/bin/bash
 
+if [ -z "$SOURCE_DIRECTORY" ]; then
+    SOURCE_DIRECTORY="."
+fi
+
 fail=0
 
 . ../../binref/env.sh
@@ -11,10 +15,10 @@ CPP_PORT=$PORT_4
 export JAVA_PORT
 export CPP_PORT
 
-$BINREF/compilejava TestErrors.java || fail=1
+$BINREF/compilejava -d . $SOURCE_DIRECTORY/TestErrors.java || fail=1
 
-bash ./dotest.sh || fail=1
+bash $SOURCE_DIRECTORY/dotest.sh || fail=1
 
-$BINREF/progctl.sh progdefs.sh stop all
+$SOURCE_DIRECTORY/../../binref/progctl.sh $SOURCE_DIRECTORY/progdefs.sh stop all
 
 exit $fail
-- 
cgit v1.2.3