diff options
| author | Arnstein Ressem <aressem@gmail.com> | 2016-08-23 15:10:36 +0200 |
|---|---|---|
| committer | Vegard Sjonfjell <vegardsjo@gmail.com> | 2016-08-23 15:10:36 +0200 |
| commit | 55e5a91901109161186e05d3a6e959e06958bbba (patch) | |
| tree | f312bab2c60207ee305dbcfa047fcc4fa8fd2dc1 /searchcore/src/tests/applyattrupdates | |
| parent | d337a29392fb752dc725e4aea5efa0cc0df5f17a (diff) | |
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.
Diffstat (limited to 'searchcore/src/tests/applyattrupdates')
| -rw-r--r-- | searchcore/src/tests/applyattrupdates/applyattrupdates.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/searchcore/src/tests/applyattrupdates/applyattrupdates.cpp b/searchcore/src/tests/applyattrupdates/applyattrupdates.cpp index 9454b51b6ac..8cb671f585e 100644 --- a/searchcore/src/tests/applyattrupdates/applyattrupdates.cpp +++ b/searchcore/src/tests/applyattrupdates/applyattrupdates.cpp @@ -134,7 +134,6 @@ private: void requireThatArrayAttributesAreUpdated(); void requireThatWeightedSetAttributesAreUpdated(); - std::string _srcdir; DocumentTypeRepo _repo; const DocumentType* _docType; @@ -318,8 +317,7 @@ Test::requireThatWeightedSetAttributesAreUpdated() } Test::Test() - : _srcdir(getenv("SOURCE_DIRECTORY") ? getenv("SOURCE_DIRECTORY") : "."), - _repo(readDocumenttypesConfig((_srcdir + "/doctypes.cfg").c_str())), + : _repo(readDocumenttypesConfig(vespalib::TestApp::GetSourceDirectory() + "doctypes.cfg")), _docType(_repo.getDocumentType("testdoc")) { } |