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.

2 files changed, 17 insertions, 14 deletions

diff --git a/vdslib/src/tests/container/documentlisttest.cpp b/vdslib/src/tests/container/documentlisttest.cpp
index 60d01a63c1b..5804c2c1646 100644
--- a/vdslib/src/tests/container/documentlisttest.cpp
+++ b/vdslib/src/tests/container/documentlisttest.cpp
@@ -12,6 +12,7 @@
 #include <vespa/document/update/documentupdate.h>
 #include <vespa/vespalib/objects/nbostream.h>
 #include <vespa/vespalib/util/random.h>
+#include <vespa/vespalib/testkit/testapp.h>
 #include <vespa/vespalib/util/vstringfmt.h>
 #include <iostream>
 
@@ -307,10 +308,10 @@ void WritableDocumentListTest::testSizeOf()
 void WritableDocumentListTest::testReadJavaFile()
 {
     DocumentTypeRepo::SP repo(new DocumentTypeRepo(readDocumenttypesConfig(
-                            "../test/files/documenttypes.cfg")));
+            vespalib::TestApp::GetSourceDirectory() + "../test/files/documenttypes.cfg")));
 
     //read file
-    int file = open("../test/files/documentlist-java.dat", O_RDONLY);
+    int file = open((vespalib::TestApp::GetSourceDirectory() + "../test/files/documentlist-java.dat").c_str(), O_RDONLY);
     if (file == -1) {
         CPPUNIT_ASSERT(0);
     }
@@ -407,10 +408,10 @@ void WritableDocumentListTest::testGetSerializedSize() {
 
 void WritableDocumentListTest::testCopyEntry() {
     DocumentTypeRepo::SP repo(new DocumentTypeRepo(readDocumenttypesConfig(
-                            "../test/files/documenttypes.cfg")));
+            vespalib::TestApp::GetSourceDirectory() + "../test/files/documenttypes.cfg")));
 
     //read file
-    int file = open("../test/files/documentlist-java.dat", O_RDONLY);
+    int file = open((vespalib::TestApp::GetSourceDirectory() + "../test/files/documentlist-java.dat").c_str(), O_RDONLY);
     if (file == -1) {
         CPPUNIT_ASSERT(0);
     }
diff --git a/vdslib/src/tests/distribution/distributiontest.cpp b/vdslib/src/tests/distribution/distributiontest.cpp
index 698b5f8da09..664c50a3fc9 100644
--- a/vdslib/src/tests/distribution/distributiontest.cpp
+++ b/vdslib/src/tests/distribution/distributiontest.cpp
@@ -12,6 +12,7 @@
 #include <stdlib.h>
 #include <vespa/vespalib/data/slime/slime.h>
 #include <vespa/vespalib/io/fileutil.h>
+#include <vespa/vespalib/testkit/testapp.h>
 #include <vespa/vespalib/text/stringtokenizer.h>
 #include <vespa/vespalib/util/regexp.h>
 #include <vespa/vespalib/stllike/lexical_cast.h>
@@ -117,16 +118,17 @@ DistributionTest::testVerifyJavaDistributions()
         ClusterState state;
         {
             std::ifstream in(
-                    ("distribution/testdata/java_" + test + ".state").c_str());
+                    (vespalib::TestApp::GetSourceDirectory() +
+                            "distribution/testdata/java_" + test + ".state").c_str());
             std::string mystate;
             in >> mystate;
             in.close();
             state = ClusterState(mystate);
         }
         Distribution distr(readConfig<vespa::config::content::StorDistributionConfig>(
-                "file:distribution/testdata/java_" + test + ".cfg"));
-        std::ofstream of(
-                ("distribution/testdata/cpp_" + test + ".distribution").c_str());
+                "file:" + vespalib::TestApp::GetSourceDirectory() + "distribution/testdata/java_" + test + ".cfg"));
+        std::ofstream of((vespalib::TestApp::GetSourceDirectory() +
+                          "distribution/testdata/cpp_" + test + ".distribution").c_str());
 
         long maxBucket = 1;
         long mask = 0;
@@ -157,8 +159,8 @@ DistributionTest::testVerifyJavaDistributions()
         }
         of.close();
         std::ostringstream cmd;
-        cmd << "diff -u distribution/testdata/cpp_" << test << ".distribution "
-            << "distribution/testdata/java_" << test << ".distribution";
+        cmd << "diff -u " << vespalib::TestApp::GetSourceDirectory() << "distribution/testdata/cpp_" << test << ".distribution "
+            << vespalib::TestApp::GetSourceDirectory() << "distribution/testdata/java_" << test << ".distribution";
         int result = system(cmd.str().c_str());
         CPPUNIT_ASSERT_EQUAL_MSG("Failed distribution sync test: " + test,
                                  0, result);
@@ -233,7 +235,7 @@ void
 DistributionTest::testVerifyJavaDistributions2()
 {
     vespalib::DirectoryList files(
-            vespalib::listDirectory("distribution/testdata"));
+            vespalib::listDirectory(vespalib::TestApp::GetSourceDirectory() + "distribution/testdata"));
     for (uint32_t i=0, n=files.size(); i<n; ++i) {
         size_t pos = files[i].find(".java.results");
         if (pos == vespalib::string::npos || pos + 13 != files[i].size()) {
@@ -245,14 +247,14 @@ DistributionTest::testVerifyJavaDistributions2()
         using namespace vespalib::slime;
         vespalib::Slime slime;
 
-        auto buf = readFile("distribution/testdata/" + files[i]);
+        auto buf = readFile(vespalib::TestApp::GetSourceDirectory() + "distribution/testdata/" + files[i]);
         auto size = JsonFormat::decode({&buf[0], buf.size()}, slime);
 
         if (size == 0) {
             std::cerr << "\n\nSize of " << files[i] << " is 0. Maybe is not generated yet? Taking a 5 second nap!";
             std::this_thread::sleep_for(std::chrono::seconds(5));
 
-            buf = readFile("distribution/testdata/" + files[i]);
+            buf = readFile(vespalib::TestApp::GetSourceDirectory() + "distribution/testdata/" + files[i]);
             size = JsonFormat::decode({&buf[0], buf.size()}, slime);
 
             if (size == 0) {
@@ -298,7 +300,7 @@ DistributionTest::testUnchangedDistribution()
     ClusterState state("distributor:10 storage:10");
 
     Distribution distr(Distribution::getDefaultDistributionConfig(3, 10));
-    std::ifstream in("distribution/testdata/41-distributordistribution");
+    std::ifstream in(vespalib::TestApp::GetSourceDirectory() + "distribution/testdata/41-distributordistribution");
 
     for (unsigned i = 0; i < 65536; i++) {
         uint16_t node = distr.getIdealDistributorNode(