diff options
| author | Arnstein Ressem <aressem@gmail.com> | 2016-08-15 15:38:23 +0200 |
|---|---|---|
| committer | Vegard Sjonfjell <vegardsjo@gmail.com> | 2016-08-15 15:38:23 +0200 |
| commit | d15dc62521c5cf26455216fa5eb3c3fe0b5c8ada (patch) | |
| tree | 195f7d2b2392d07ec6e1c2b9dc14a7a965ecc65c /searchcore/src/tests/proton/docsummary | |
| parent | e534ad2c12af07da88b8264c2be189f5f686e927 (diff) | |
Aressem/cmake out of source test for script (#409)
* First script runs out of source.
* Call scripts from source directory.
* One more test passing.
* Searchcore tests pass out of source.
* Searchlib tests run out of source:
Diffstat (limited to 'searchcore/src/tests/proton/docsummary')
| -rw-r--r-- | searchcore/src/tests/proton/docsummary/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | searchcore/src/tests/proton/docsummary/docsummary.cpp | 8 |
2 files changed, 6 insertions, 4 deletions
diff --git a/searchcore/src/tests/proton/docsummary/CMakeLists.txt b/searchcore/src/tests/proton/docsummary/CMakeLists.txt index 7550a80aa3a..8e2aa848ee4 100644 --- a/searchcore/src/tests/proton/docsummary/CMakeLists.txt +++ b/searchcore/src/tests/proton/docsummary/CMakeLists.txt @@ -29,4 +29,4 @@ vespa_add_executable(searchcore_summaryfieldconverter_test_app DEPENDS searchcore_docsummary ) -vespa_add_test(NAME searchcore_docsummary_test_app COMMAND sh docsummary_test.sh) +vespa_add_test(NAME searchcore_docsummary_test_app COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/docsummary_test.sh) diff --git a/searchcore/src/tests/proton/docsummary/docsummary.cpp b/searchcore/src/tests/proton/docsummary/docsummary.cpp index 80eaf56bcba..5aaded3c848 100644 --- a/searchcore/src/tests/proton/docsummary/docsummary.cpp +++ b/searchcore/src/tests/proton/docsummary/docsummary.cpp @@ -155,7 +155,7 @@ public: _queryLimiter(), _clock(), _dummy(), - _spec("."), + _spec(getenv("SOURCE_DIRECTORY") ? getenv("SOURCE_DIRECTORY") : "."), _configMgr(_spec, getDocTypeName()), _documenttypesConfig(new DocumenttypesConfig()), _repo(repo), @@ -1246,11 +1246,13 @@ Test::Test() _resultCfg(), _markupFields() { + auto envSrcDir = getenv("SOURCE_DIRECTORY"); + std::string srcDir = envSrcDir ? envSrcDir : "."; std::string cfgId("summary"); - _summaryCfg = config::ConfigGetter<vespa::config::search::SummaryConfig>::getConfig(cfgId, config::FileSpec("summary.cfg")); + _summaryCfg = config::ConfigGetter<vespa::config::search::SummaryConfig>::getConfig(cfgId, config::FileSpec(srcDir + "/summary.cfg")); _resultCfg.ReadConfig(*_summaryCfg, cfgId.c_str()); std::string mapCfgId("summarymap"); - std::unique_ptr<vespa::config::search::SummarymapConfig> mapCfg = config::ConfigGetter<vespa::config::search::SummarymapConfig>::getConfig(mapCfgId, config::FileSpec("summarymap.cfg")); + std::unique_ptr<vespa::config::search::SummarymapConfig> mapCfg = config::ConfigGetter<vespa::config::search::SummarymapConfig>::getConfig(mapCfgId, config::FileSpec(srcDir + "/summarymap.cfg")); for (size_t i = 0; i < mapCfg->override.size(); ++i) { const vespa::config::search::SummarymapConfig::Override & o = mapCfg->override[i]; if (o.command == "dynamicteaser") { |