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.

7 files changed, 16 insertions, 21 deletions

diff --git a/searchlib/src/tests/datastore/logdatastore_test.cpp b/searchlib/src/tests/datastore/logdatastore_test.cpp
index 666b725d8de..762bdeb4618 100644
--- a/searchlib/src/tests/datastore/logdatastore_test.cpp
+++ b/searchlib/src/tests/datastore/logdatastore_test.cpp
@@ -271,14 +271,14 @@ void fetchAndTest(IDataStore & datastore, uint32_t lid, const void *a, size_t sz
 }
 
 TEST("testTruncatedIdxFile"){
-    std::string srcDir = getenv("SOURCE_DIRECTORY") ? getenv("SOURCE_DIRECTORY") : ".";
     LogDataStore::Config config;
     DummyFileHeaderContext fileHeaderContext;
     vespalib::ThreadStackExecutor executor(config.getNumThreads(), 128*1024);
     MyTlSyncer tlSyncer;
     {
         // Files comes from the 'growing test'.
-        LogDataStore datastore(executor, srcDir + "/bug-7257706", config,
+        LogDataStore datastore(executor,
+                               vespalib::TestApp::GetSourceDirectory() + "bug-7257706", config,
                                GrowStrategy(), TuneFileSummary(),
                                fileHeaderContext, tlSyncer, NULL);
         EXPECT_EQUAL(354ul, datastore.lastSyncToken());
diff --git a/searchlib/src/tests/datastore/logdatastore_test.sh b/searchlib/src/tests/datastore/logdatastore_test.sh
index 662c7a767aa..2674f3831d6 100755
--- a/searchlib/src/tests/datastore/logdatastore_test.sh
+++ b/searchlib/src/tests/datastore/logdatastore_test.sh
@@ -6,11 +6,11 @@ if [ -z "$SOURCE_DIRECTORY" ]; then
 fi
 
 cp -r $SOURCE_DIRECTORY/bug-7257706 bug-7257706-truncated
-mkdir dangling-test
-cp $SOURCE_DIRECTORY/bug-7257706/*.dat dangling-test/
-cp $SOURCE_DIRECTORY/bug-7257706/*.idx dangling-test/
-cp $SOURCE_DIRECTORY/dangling/*.dat dangling-test/
-cp $SOURCE_DIRECTORY/dangling/*.idx dangling-test/
+mkdir -p dangling-test
+cp -a $SOURCE_DIRECTORY/bug-7257706/*.dat dangling-test/
+cp -a $SOURCE_DIRECTORY/bug-7257706/*.idx dangling-test/
+cp -a $SOURCE_DIRECTORY/dangling/*.dat dangling-test/
+cp -a $SOURCE_DIRECTORY/dangling/*.idx dangling-test/
 truncate --size 3830 bug-7257706-truncated/1422358701368384000.idx
 VESPA_LOG_TARGET=file:vlog2.txt $VALGRIND ./searchlib_logdatastore_test_app
 rm -rf bug-7257706-truncated dangling-test
diff --git a/searchlib/src/tests/fef/featurenameparser/featurenameparser_test.cpp b/searchlib/src/tests/fef/featurenameparser/featurenameparser_test.cpp
index 1314bee5b15..5b4e3c96da5 100644
--- a/searchlib/src/tests/fef/featurenameparser/featurenameparser_test.cpp
+++ b/searchlib/src/tests/fef/featurenameparser/featurenameparser_test.cpp
@@ -144,8 +144,7 @@ Test::Main()
     EXPECT_TRUE(testParse("foo(  ,  ,  )", true, "foo", ParamList().add("").add("").add(""), ""));
     EXPECT_TRUE(testParse("foo( \t , \n , \r , \f )", true, "foo", ParamList().add("").add("").add("").add(""), ""));
 
-    const std::string srcDir = getenv("SOURCE_DIRECTORY") ? getenv("SOURCE_DIRECTORY") : ".";
-    testFile(srcDir + "/parsetest.txt");
+    testFile(vespalib::TestApp::GetSourceDirectory() + "parsetest.txt");
     TEST_DONE();
 }
 
diff --git a/searchlib/src/tests/fef/table/table_test.cpp b/searchlib/src/tests/fef/table/table_test.cpp
index 74fb37ab672..6835b6df5b0 100644
--- a/searchlib/src/tests/fef/table/table_test.cpp
+++ b/searchlib/src/tests/fef/table/table_test.cpp
@@ -25,7 +25,6 @@ private:
     void testFunctionTableFactory();
     void testTableManager();
 
-    const std::string _srcDir;
     const std::string _tables1Dir;
     const std::string _tables2Dir;
 public:
@@ -35,9 +34,8 @@ public:
 
 TableTest::TableTest() :
     vespalib::TestApp(),
-    _srcDir(getenv("SOURCE_DIRECTORY") ? getenv("SOURCE_DIRECTORY") : "."),
-    _tables1Dir(_srcDir + "/tables1"),
-    _tables2Dir(_srcDir + "/tables2")
+    _tables1Dir(vespalib::TestApp::GetSourceDirectory() + "tables1"),
+    _tables2Dir(vespalib::TestApp::GetSourceDirectory() + "tables2")
 {
 }
 
diff --git a/searchlib/src/tests/grouping/grouping_serialization_test.cpp b/searchlib/src/tests/grouping/grouping_serialization_test.cpp
index efc559a5bab..a194ed7232b 100644
--- a/searchlib/src/tests/grouping/grouping_serialization_test.cpp
+++ b/searchlib/src/tests/grouping/grouping_serialization_test.cpp
@@ -43,8 +43,7 @@ document::GlobalId getGlobalId(uint32_t docId) {
 struct Fixture {
     // Set WRITE_FILES to true to generate new expected serialization files.
     const bool WRITE_FILES = false;
-    const std::string src_dir = getenv("SOURCE_DIRECTORY") ? getenv("SOURCE_DIRECTORY") : ".";
-    const std::string file_path = src_dir + "/../../test/files/";
+    const std::string file_path = vespalib::TestApp::GetSourceDirectory() + "../../test/files/";
     std::string file_name;
     std::ifstream file_stream;
 
diff --git a/searchlib/src/tests/indexmetainfo/indexmetainfo_test.cpp b/searchlib/src/tests/indexmetainfo/indexmetainfo_test.cpp
index 4bd40863fc2..522f748c423 100644
--- a/searchlib/src/tests/indexmetainfo/indexmetainfo_test.cpp
+++ b/searchlib/src/tests/indexmetainfo/indexmetainfo_test.cpp
@@ -4,6 +4,7 @@
 LOG_SETUP("indexmetainfo_test");
 #include <vespa/vespalib/testkit/testapp.h>
 #include <vespa/searchlib/common/indexmetainfo.h>
+#include "../../../../vespalib/src/vespa/vespalib/testkit/testapp.h"
 
 using search::IndexMetaInfo;
 
@@ -14,11 +15,9 @@ TEST_SETUP(Test)
 int
 Test::Main()
 {
-    const std::string srcDir = getenv("SOURCE_DIRECTORY") ? getenv("SOURCE_DIRECTORY") : ".";
-
     TEST_INIT("indexmetainfo_test");
     { // load pregenerated file
-        IndexMetaInfo info(srcDir);
+        IndexMetaInfo info(vespalib::TestApp::GetSourceDirectory());
         EXPECT_TRUE(info.load());
         ASSERT_TRUE(info.snapshots().size() == 4);
         EXPECT_TRUE(info.snapshots()[0].valid);
@@ -90,7 +89,7 @@ Test::Main()
         EXPECT_TRUE(!info.load("file-not-present.txt"));
     }
     { // load files with errors should fail
-        IndexMetaInfo info(srcDir);
+        IndexMetaInfo info(vespalib::TestApp::GetSourceDirectory());
         EXPECT_TRUE(!info.load("bogus1.txt"));
         EXPECT_TRUE(!info.load("bogus2.txt"));
         EXPECT_TRUE(!info.load("bogus3.txt"));
diff --git a/searchlib/src/tests/queryeval/weak_and/CMakeLists.txt b/searchlib/src/tests/queryeval/weak_and/CMakeLists.txt
index c621219227d..b9f537fd895 100644
--- a/searchlib/src/tests/queryeval/weak_and/CMakeLists.txt
+++ b/searchlib/src/tests/queryeval/weak_and/CMakeLists.txt
@@ -20,11 +20,11 @@ vespa_add_executable(searchlib_weak_and_bench_app
     DEPENDS
     searchlib
 )
-vespa_add_test(NAME searchlib_weak_and_test_expensive_app COMMAND searchlib_weak_and_bench_app BENCHMARK)
+vespa_add_test(NAME searchlib_weak_and_bench_app COMMAND searchlib_weak_and_bench_app BENCHMARK)
 vespa_add_executable(searchlib_parallel_weak_and_bench_app
     SOURCES
     parallel_weak_and_bench.cpp
     DEPENDS
     searchlib
 )
-vespa_add_test(NAME searchlib_weak_and_test_expensive_app COMMAND searchlib_parallel_weak_and_bench_app BENCHMARK)
+vespa_add_test(NAME searchlib_parallel_weak_and_bench_app COMMAND searchlib_parallel_weak_and_bench_app BENCHMARK)