diff options
Diffstat (limited to 'searchcore/src')
18 files changed, 26 insertions, 19 deletions
diff --git a/searchcore/src/tests/applyattrupdates/applyattrupdates.cpp b/searchcore/src/tests/applyattrupdates/applyattrupdates.cpp index ea85cebaf44..9454b51b6ac 100644 --- a/searchcore/src/tests/applyattrupdates/applyattrupdates.cpp +++ b/searchcore/src/tests/applyattrupdates/applyattrupdates.cpp @@ -134,6 +134,7 @@ private: void requireThatArrayAttributesAreUpdated(); void requireThatWeightedSetAttributesAreUpdated(); + std::string _srcdir; DocumentTypeRepo _repo; const DocumentType* _docType; @@ -317,7 +318,8 @@ Test::requireThatWeightedSetAttributesAreUpdated() } Test::Test() - : _repo(readDocumenttypesConfig("doctypes.cfg")), + : _srcdir(getenv("SOURCE_DIRECTORY") ? getenv("SOURCE_DIRECTORY") : "."), + _repo(readDocumenttypesConfig((_srcdir + "/doctypes.cfg").c_str())), _docType(_repo.getDocumentType("testdoc")) { } diff --git a/searchcore/src/tests/proton/attribute/CMakeLists.txt b/searchcore/src/tests/proton/attribute/CMakeLists.txt index 4082a8f5563..8fc96538d10 100644 --- a/searchcore/src/tests/proton/attribute/CMakeLists.txt +++ b/searchcore/src/tests/proton/attribute/CMakeLists.txt @@ -8,7 +8,7 @@ vespa_add_executable(searchcore_attribute_test_app TEST searchcore_flushengine searchcore_pcommon ) -vespa_add_test(NAME searchcore_attribute_test_app COMMAND sh attribute_test.sh) +vespa_add_test(NAME searchcore_attribute_test_app COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/attribute_test.sh) vespa_add_executable(searchcore_attributeflush_test_app TEST SOURCES attributeflush_test.cpp @@ -18,4 +18,4 @@ vespa_add_executable(searchcore_attributeflush_test_app TEST searchcore_flushengine searchcore_pcommon ) -vespa_add_test(NAME searchcore_attributeflush_test_app COMMAND sh attributeflush_test.sh) +vespa_add_test(NAME searchcore_attributeflush_test_app COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/attributeflush_test.sh) 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") { diff --git a/searchcore/src/tests/proton/documentdb/CMakeLists.txt b/searchcore/src/tests/proton/documentdb/CMakeLists.txt index 7cd23e47d00..28a4ca564ed 100644 --- a/searchcore/src/tests/proton/documentdb/CMakeLists.txt +++ b/searchcore/src/tests/proton/documentdb/CMakeLists.txt @@ -21,4 +21,4 @@ vespa_add_executable(searchcore_documentdb_test_app TEST searchcore_fconfig searchcore_util ) -vespa_add_test(NAME searchcore_documentdb_test_app COMMAND sh documentdb_test.sh) +vespa_add_test(NAME searchcore_documentdb_test_app COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/documentdb_test.sh) diff --git a/searchcore/src/tests/proton/documentdb/document_subdbs/document_subdbs_test.cpp b/searchcore/src/tests/proton/documentdb/document_subdbs/document_subdbs_test.cpp index 4744b13951a..b2150db91dc 100644 --- a/searchcore/src/tests/proton/documentdb/document_subdbs/document_subdbs_test.cpp +++ b/searchcore/src/tests/proton/documentdb/document_subdbs/document_subdbs_test.cpp @@ -54,12 +54,13 @@ typedef std::vector<AttributeGuard> AttributeGuardList; const std::string DOCTYPE_NAME = "searchdocument"; const std::string SUB_NAME = "subdb"; const std::string BASE_DIR = "basedir"; +const std::string SOURCE_DIR = getenv("SOURCE_DIRECTORY") ? getenv("SOURCE_DIRECTORY") : "."; const SerialNum CFG_SERIAL = 5; -struct ConfigDir1 { static vespalib::string dir() { return "cfg1"; } }; -struct ConfigDir2 { static vespalib::string dir() { return "cfg2"; } }; -struct ConfigDir3 { static vespalib::string dir() { return "cfg3"; } }; -struct ConfigDir4 { static vespalib::string dir() { return "cfg4"; } }; +struct ConfigDir1 { static vespalib::string dir() { return SOURCE_DIR + "/cfg1"; } }; +struct ConfigDir2 { static vespalib::string dir() { return SOURCE_DIR + "/cfg2"; } }; +struct ConfigDir3 { static vespalib::string dir() { return SOURCE_DIR + "/cfg3"; } }; +struct ConfigDir4 { static vespalib::string dir() { return SOURCE_DIR + "/cfg4"; } }; struct MySubDBOwner : public IDocumentSubDB::IOwner { diff --git a/searchcore/src/tests/proton/documentdb/documentdb_test.cpp b/searchcore/src/tests/proton/documentdb/documentdb_test.cpp index cba08197b56..dec1dc08471 100644 --- a/searchcore/src/tests/proton/documentdb/documentdb_test.cpp +++ b/searchcore/src/tests/proton/documentdb/documentdb_test.cpp @@ -72,7 +72,8 @@ Fixture::Fixture() DocumentType docType("typea", 0); DocumentTypeRepo::SP repo(new DocumentTypeRepo(docType)); TuneFileDocumentDB::SP tuneFileDocumentDB(new TuneFileDocumentDB); - config::DirSpec spec("cfg"); + std::string srcDir = getenv("SOURCE_DIRECTORY") ? getenv("SOURCE_DIRECTORY") : "."; + config::DirSpec spec(srcDir + "/cfg"); DocumentDBConfigHelper mgr(spec, "typea"); BootstrapConfig::SP b(new BootstrapConfig(1, diff --git a/searchcore/src/tests/proton/documentdb/documentdb_test.sh b/searchcore/src/tests/proton/documentdb/documentdb_test.sh index ae975d561fb..ae975d561fb 100644..100755 --- a/searchcore/src/tests/proton/documentdb/documentdb_test.sh +++ b/searchcore/src/tests/proton/documentdb/documentdb_test.sh diff --git a/searchcore/src/tests/proton/documentdb/feedhandler/CMakeLists.txt b/searchcore/src/tests/proton/documentdb/feedhandler/CMakeLists.txt index fe848e0588b..01386479d69 100644 --- a/searchcore/src/tests/proton/documentdb/feedhandler/CMakeLists.txt +++ b/searchcore/src/tests/proton/documentdb/feedhandler/CMakeLists.txt @@ -15,4 +15,4 @@ vespa_add_executable(searchcore_feedhandler_test_app TEST searchcore_util searchcore_fconfig ) -vespa_add_test(NAME searchcore_feedhandler_test_app COMMAND sh feedhandler_test.sh) +vespa_add_test(NAME searchcore_feedhandler_test_app COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/feedhandler_test.sh) diff --git a/searchcore/src/tests/proton/documentdb/feedhandler/feedhandler_test.sh b/searchcore/src/tests/proton/documentdb/feedhandler/feedhandler_test.sh index 5eb03ff07f5..5eb03ff07f5 100644..100755 --- a/searchcore/src/tests/proton/documentdb/feedhandler/feedhandler_test.sh +++ b/searchcore/src/tests/proton/documentdb/feedhandler/feedhandler_test.sh diff --git a/searchcore/src/tests/proton/documentdb/fileconfigmanager/CMakeLists.txt b/searchcore/src/tests/proton/documentdb/fileconfigmanager/CMakeLists.txt index f5c40a85192..7ab8882f339 100644 --- a/searchcore/src/tests/proton/documentdb/fileconfigmanager/CMakeLists.txt +++ b/searchcore/src/tests/proton/documentdb/fileconfigmanager/CMakeLists.txt @@ -7,5 +7,5 @@ vespa_add_executable(searchcore_fileconfigmanager_test_app TEST searchcore_pcommon searchcore_fconfig ) -vespa_add_test(NAME searchcore_fileconfigmanager_test_app COMMAND sh fileconfigmanager_test.sh) +vespa_add_test(NAME searchcore_fileconfigmanager_test_app COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/fileconfigmanager_test.sh) vespa_generate_config(searchcore_fileconfigmanager_test_app mycfg.def) diff --git a/searchcore/src/tests/proton/documentdb/fileconfigmanager/fileconfigmanager_test.cpp b/searchcore/src/tests/proton/documentdb/fileconfigmanager/fileconfigmanager_test.cpp index 0960ff6b2fe..75cf6601f5a 100644 --- a/searchcore/src/tests/proton/documentdb/fileconfigmanager/fileconfigmanager_test.cpp +++ b/searchcore/src/tests/proton/documentdb/fileconfigmanager/fileconfigmanager_test.cpp @@ -86,7 +86,8 @@ getSchema(int step) DocumentDBConfig::SP makeBaseConfigSnapshot() { - config::DirSpec spec("cfg"); + std::string srcDir = getenv("SOURCE_DIRECTORY") ? getenv("SOURCE_DIRECTORY") : "."; + config::DirSpec spec(srcDir + "/cfg"); ConfigKeySet extraKeySet; extraKeySet.add<MycfgConfig>(""); DBCM dbcm(spec, "test", extraKeySet); diff --git a/searchcore/src/tests/proton/documentdb/fileconfigmanager/fileconfigmanager_test.sh b/searchcore/src/tests/proton/documentdb/fileconfigmanager/fileconfigmanager_test.sh index f88c63b1220..f88c63b1220 100644..100755 --- a/searchcore/src/tests/proton/documentdb/fileconfigmanager/fileconfigmanager_test.sh +++ b/searchcore/src/tests/proton/documentdb/fileconfigmanager/fileconfigmanager_test.sh diff --git a/searchcore/src/tests/proton/documentmetastore/CMakeLists.txt b/searchcore/src/tests/proton/documentmetastore/CMakeLists.txt index 56b07ffc181..9d3a2f1de23 100644 --- a/searchcore/src/tests/proton/documentmetastore/CMakeLists.txt +++ b/searchcore/src/tests/proton/documentmetastore/CMakeLists.txt @@ -10,4 +10,4 @@ vespa_add_executable(searchcore_documentmetastore_test_app TEST searchcore_feedoperation searchcore_fconfig ) -vespa_add_test(NAME searchcore_documentmetastore_test_app COMMAND sh documentmetastore_test.sh) +vespa_add_test(NAME searchcore_documentmetastore_test_app COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/documentmetastore_test.sh) diff --git a/searchcore/src/tests/proton/documentmetastore/documentmetastore_test.sh b/searchcore/src/tests/proton/documentmetastore/documentmetastore_test.sh index 4c334df32d7..4c334df32d7 100644..100755 --- a/searchcore/src/tests/proton/documentmetastore/documentmetastore_test.sh +++ b/searchcore/src/tests/proton/documentmetastore/documentmetastore_test.sh diff --git a/searchcore/src/tests/proton/index/CMakeLists.txt b/searchcore/src/tests/proton/index/CMakeLists.txt index be3fff431a9..68064365b8a 100644 --- a/searchcore/src/tests/proton/index/CMakeLists.txt +++ b/searchcore/src/tests/proton/index/CMakeLists.txt @@ -30,4 +30,4 @@ vespa_add_executable(searchcore_indexcollection_test_app TEST DEPENDS searchcore_index ) -vespa_add_test(NAME searchcore_index_test COMMAND sh index_test.sh) +vespa_add_test(NAME searchcore_index_test COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/index_test.sh) diff --git a/searchcore/src/tests/proton/index/index_test.sh b/searchcore/src/tests/proton/index/index_test.sh index 91c271128fe..91c271128fe 100644..100755 --- a/searchcore/src/tests/proton/index/index_test.sh +++ b/searchcore/src/tests/proton/index/index_test.sh diff --git a/searchcore/src/tests/proton/verify_ranksetup/CMakeLists.txt b/searchcore/src/tests/proton/verify_ranksetup/CMakeLists.txt index a3a03ea8849..71def96300f 100644 --- a/searchcore/src/tests/proton/verify_ranksetup/CMakeLists.txt +++ b/searchcore/src/tests/proton/verify_ranksetup/CMakeLists.txt @@ -4,4 +4,4 @@ vespa_add_executable(searchcore_verify_ranksetup_test_app TEST verify_ranksetup_test.cpp DEPENDS ) -vespa_add_test(NAME searchcore_verify_ranksetup_test_app COMMAND sh verify_ranksetup_test.sh) +vespa_add_test(NAME searchcore_verify_ranksetup_test_app COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/verify_ranksetup_test.sh) |