From 55e5a91901109161186e05d3a6e959e06958bbba Mon Sep 17 00:00:00 2001 From: Arnstein Ressem 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. --- searchlib/src/tests/fef/table/table_test.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'searchlib/src/tests/fef/table') 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") { } -- cgit v1.2.3