diff options
41 files changed, 78 insertions, 47 deletions
diff --git a/functions.cmake b/functions.cmake index fed07cf56d7..7064a81e2f7 100644 --- a/functions.cmake +++ b/functions.cmake @@ -372,7 +372,9 @@ function(vespa_add_test) add_test(NAME ${ARG_NAME} COMMAND ${ARG_COMMAND} WORKING_DIRECTORY ${ARG_WORKING_DIRECTORY}) if(ARG_ENVIRONMENT) - set_tests_properties(${ARG_NAME} PROPERTIES ENVIRONMENT "${ARG_ENVIRONMENT}") + set_tests_properties(${ARG_NAME} PROPERTIES ENVIRONMENT "SOURCE_DIRECTORY=${CMAKE_CURRENT_SOURCE_DIR};${ARG_ENVIRONMENT}") + else() + set_tests_properties(${ARG_NAME} PROPERTIES ENVIRONMENT "SOURCE_DIRECTORY=${CMAKE_CURRENT_SOURCE_DIR}") endif() if(ARG_RUN_SERIAL) 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) diff --git a/searchlib/src/tests/attribute/changevector/CMakeLists.txt b/searchlib/src/tests/attribute/changevector/CMakeLists.txt index 48c840e4e8c..320120f6f2b 100644 --- a/searchlib/src/tests/attribute/changevector/CMakeLists.txt +++ b/searchlib/src/tests/attribute/changevector/CMakeLists.txt @@ -4,4 +4,4 @@ vespa_add_executable(searchlib_changevector_test_app TEST DEPENDS searchlib ) -vespa_add_test(NAME searchlib_changevector_test_app COMMAND sh changevector_test.sh) +vespa_add_test(NAME searchlib_changevector_test_app COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/changevector_test.sh) diff --git a/searchlib/src/tests/attribute/changevector/changevector_test.sh b/searchlib/src/tests/attribute/changevector/changevector_test.sh index 23b08c5a637..23b08c5a637 100644..100755 --- a/searchlib/src/tests/attribute/changevector/changevector_test.sh +++ b/searchlib/src/tests/attribute/changevector/changevector_test.sh diff --git a/searchlib/src/tests/attribute/extendattributes/CMakeLists.txt b/searchlib/src/tests/attribute/extendattributes/CMakeLists.txt index 207519951ae..6ef33619dc4 100644 --- a/searchlib/src/tests/attribute/extendattributes/CMakeLists.txt +++ b/searchlib/src/tests/attribute/extendattributes/CMakeLists.txt @@ -5,4 +5,4 @@ vespa_add_executable(searchlib_extendattribute_test_app TEST DEPENDS searchlib ) -vespa_add_test(NAME searchlib_extendattribute_test_app COMMAND sh extendattribute_test.sh) +vespa_add_test(NAME searchlib_extendattribute_test_app COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/extendattribute_test.sh) diff --git a/searchlib/src/tests/attribute/guard/CMakeLists.txt b/searchlib/src/tests/attribute/guard/CMakeLists.txt index 58b04ea09e5..8b5d7a6f08b 100644 --- a/searchlib/src/tests/attribute/guard/CMakeLists.txt +++ b/searchlib/src/tests/attribute/guard/CMakeLists.txt @@ -5,4 +5,4 @@ vespa_add_executable(searchlib_attributeguard_test_app TEST DEPENDS searchlib ) -vespa_add_test(NAME searchlib_attributeguard_test_app COMMAND sh attributeguard_test.sh) +vespa_add_test(NAME searchlib_attributeguard_test_app COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/attributeguard_test.sh) diff --git a/searchlib/src/tests/attribute/guard/attributeguard_test.sh b/searchlib/src/tests/attribute/guard/attributeguard_test.sh index 2f3e65dbc91..2f3e65dbc91 100644..100755 --- a/searchlib/src/tests/attribute/guard/attributeguard_test.sh +++ b/searchlib/src/tests/attribute/guard/attributeguard_test.sh diff --git a/searchlib/src/tests/attribute/postinglistattribute/CMakeLists.txt b/searchlib/src/tests/attribute/postinglistattribute/CMakeLists.txt index 3b2f86a6509..4f93d552775 100644 --- a/searchlib/src/tests/attribute/postinglistattribute/CMakeLists.txt +++ b/searchlib/src/tests/attribute/postinglistattribute/CMakeLists.txt @@ -5,4 +5,4 @@ vespa_add_executable(searchlib_postinglistattribute_test_app TEST DEPENDS searchlib ) -vespa_add_test(NAME searchlib_postinglistattribute_test_app COMMAND sh postinglistattribute_test.sh) +vespa_add_test(NAME searchlib_postinglistattribute_test_app COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/postinglistattribute_test.sh) diff --git a/searchlib/src/tests/attribute/searchcontext/CMakeLists.txt b/searchlib/src/tests/attribute/searchcontext/CMakeLists.txt index 6a921ce242c..d9f69fbd15b 100644 --- a/searchlib/src/tests/attribute/searchcontext/CMakeLists.txt +++ b/searchlib/src/tests/attribute/searchcontext/CMakeLists.txt @@ -6,4 +6,4 @@ vespa_add_executable(searchlib_searchcontext_test_app TEST searchlib searchlib_test ) -vespa_add_test(NAME searchlib_searchcontext_test_app COMMAND sh searchcontext_test.sh) +vespa_add_test(NAME searchlib_searchcontext_test_app COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/searchcontext_test.sh) diff --git a/searchlib/src/tests/attribute/stringattribute/CMakeLists.txt b/searchlib/src/tests/attribute/stringattribute/CMakeLists.txt index 2aa39bcca48..9491875b238 100644 --- a/searchlib/src/tests/attribute/stringattribute/CMakeLists.txt +++ b/searchlib/src/tests/attribute/stringattribute/CMakeLists.txt @@ -5,4 +5,4 @@ vespa_add_executable(searchlib_stringattribute_test_app TEST DEPENDS searchlib ) -vespa_add_test(NAME searchlib_stringattribute_test_app COMMAND sh stringattribute_test.sh) +vespa_add_test(NAME searchlib_stringattribute_test_app COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/stringattribute_test.sh) diff --git a/searchlib/src/tests/attribute/tensorattribute/CMakeLists.txt b/searchlib/src/tests/attribute/tensorattribute/CMakeLists.txt index 81b7bc9b1cf..fdd4570deff 100644 --- a/searchlib/src/tests/attribute/tensorattribute/CMakeLists.txt +++ b/searchlib/src/tests/attribute/tensorattribute/CMakeLists.txt @@ -5,4 +5,4 @@ vespa_add_executable(searchlib_tensorattribute_test_app TEST DEPENDS searchlib ) -vespa_add_test(NAME searchlib_tensorattribute_test_app COMMAND sh tensorattribute_test.sh) +vespa_add_test(NAME searchlib_tensorattribute_test_app COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/tensorattribute_test.sh) diff --git a/searchlib/src/tests/attribute/tensorattribute/tensorattribute_test.sh b/searchlib/src/tests/attribute/tensorattribute/tensorattribute_test.sh index 1f24dbafa16..1f24dbafa16 100644..100755 --- a/searchlib/src/tests/attribute/tensorattribute/tensorattribute_test.sh +++ b/searchlib/src/tests/attribute/tensorattribute/tensorattribute_test.sh diff --git a/searchlib/src/tests/datastore/CMakeLists.txt b/searchlib/src/tests/datastore/CMakeLists.txt index 576393d1a34..e617b221b24 100644 --- a/searchlib/src/tests/datastore/CMakeLists.txt +++ b/searchlib/src/tests/datastore/CMakeLists.txt @@ -5,4 +5,4 @@ vespa_add_executable(searchlib_logdatastore_test_app TEST DEPENDS searchlib ) -vespa_add_test(NAME searchlib_logdatastore_test_app COMMAND sh logdatastore_test.sh) +vespa_add_test(NAME searchlib_logdatastore_test_app COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/logdatastore_test.sh) diff --git a/searchlib/src/tests/datastore/logdatastore_test.cpp b/searchlib/src/tests/datastore/logdatastore_test.cpp index f31f6cdc413..666b725d8de 100644 --- a/searchlib/src/tests/datastore/logdatastore_test.cpp +++ b/searchlib/src/tests/datastore/logdatastore_test.cpp @@ -271,13 +271,14 @@ void fetchAndTest(IDataStore & datastore, uint32_t lid, const void *a, size_t sz } TEST("testTruncatedIdxFile"){ + std::string srcDir = getenv("SOURCE_DIRECTORY") ? getenv("SOURCE_DIRECTORY") : "."; LogDataStore::Config config; DummyFileHeaderContext fileHeaderContext; vespalib::ThreadStackExecutor executor(config.getNumThreads(), 128*1024); MyTlSyncer tlSyncer; { // Files comes from the 'growing test'. - LogDataStore datastore(executor, "bug-7257706", config, + LogDataStore datastore(executor, srcDir + "/bug-7257706", config, GrowStrategy(), TuneFileSummary(), fileHeaderContext, tlSyncer, NULL); EXPECT_EQUAL(354ul, datastore.lastSyncToken()); diff --git a/searchlib/src/tests/datastore/logdatastore_test.sh b/searchlib/src/tests/datastore/logdatastore_test.sh index 0f0b5ac255a..662c7a767aa 100755 --- a/searchlib/src/tests/datastore/logdatastore_test.sh +++ b/searchlib/src/tests/datastore/logdatastore_test.sh @@ -1,11 +1,16 @@ #!/bin/bash set -e -cp -r bug-7257706 bug-7257706-truncated + +if [ -z "$SOURCE_DIRECTORY" ]; then + SOURCE_DIRECTORY="." +fi + +cp -r $SOURCE_DIRECTORY/bug-7257706 bug-7257706-truncated mkdir dangling-test -cp bug-7257706/*.dat dangling-test/ -cp bug-7257706/*.idx dangling-test/ -cp dangling/*.dat dangling-test/ -cp dangling/*.idx dangling-test/ +cp $SOURCE_DIRECTORY/bug-7257706/*.dat dangling-test/ +cp $SOURCE_DIRECTORY/bug-7257706/*.idx dangling-test/ +cp $SOURCE_DIRECTORY/dangling/*.dat dangling-test/ +cp $SOURCE_DIRECTORY/dangling/*.idx dangling-test/ truncate --size 3830 bug-7257706-truncated/1422358701368384000.idx VESPA_LOG_TARGET=file:vlog2.txt $VALGRIND ./searchlib_logdatastore_test_app rm -rf bug-7257706-truncated dangling-test diff --git a/searchlib/src/tests/diskindex/fieldwriter/CMakeLists.txt b/searchlib/src/tests/diskindex/fieldwriter/CMakeLists.txt index f13f49a9051..e747871a5a4 100644 --- a/searchlib/src/tests/diskindex/fieldwriter/CMakeLists.txt +++ b/searchlib/src/tests/diskindex/fieldwriter/CMakeLists.txt @@ -6,4 +6,4 @@ vespa_add_executable(searchlib_fieldwriter_test_app TEST searchlib_test searchlib ) -vespa_add_test(NAME searchlib_fieldwriter_test_app COMMAND sh runtests.sh) +vespa_add_test(NAME searchlib_fieldwriter_test_app COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/runtests.sh) diff --git a/searchlib/src/tests/diskindex/fusion/CMakeLists.txt b/searchlib/src/tests/diskindex/fusion/CMakeLists.txt index 3ac9c4aad9c..246ab3632e3 100644 --- a/searchlib/src/tests/diskindex/fusion/CMakeLists.txt +++ b/searchlib/src/tests/diskindex/fusion/CMakeLists.txt @@ -7,4 +7,4 @@ vespa_add_executable(searchlib_fusion_test_app TEST AFTER searchlib_vespa-index-inspect_app ) -vespa_add_test(NAME searchlib_fusion_test_app COMMAND sh fusion_test.sh) +vespa_add_test(NAME searchlib_fusion_test_app COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/fusion_test.sh) diff --git a/searchlib/src/tests/features/CMakeLists.txt b/searchlib/src/tests/features/CMakeLists.txt index 965366f6ab8..3bbcf61be12 100644 --- a/searchlib/src/tests/features/CMakeLists.txt +++ b/searchlib/src/tests/features/CMakeLists.txt @@ -9,7 +9,7 @@ vespa_add_executable(searchlib_prod_features_test_app TEST DEPENDS searchlib ) -vespa_add_test(NAME searchlib_prod_features_test_app COMMAND sh prod_features_test.sh) +vespa_add_test(NAME searchlib_prod_features_test_app COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/prod_features_test.sh) vespa_add_executable(searchlib_featurebenchmark_app SOURCES featurebenchmark.cpp diff --git a/searchlib/src/tests/fef/featurenameparser/featurenameparser_test.cpp b/searchlib/src/tests/fef/featurenameparser/featurenameparser_test.cpp index 2824f5ef8fc..1314bee5b15 100644 --- a/searchlib/src/tests/fef/featurenameparser/featurenameparser_test.cpp +++ b/searchlib/src/tests/fef/featurenameparser/featurenameparser_test.cpp @@ -144,7 +144,8 @@ Test::Main() EXPECT_TRUE(testParse("foo( , , )", true, "foo", ParamList().add("").add("").add(""), "")); EXPECT_TRUE(testParse("foo( \t , \n , \r , \f )", true, "foo", ParamList().add("").add("").add("").add(""), "")); - testFile("parsetest.txt"); + const std::string srcDir = getenv("SOURCE_DIRECTORY") ? getenv("SOURCE_DIRECTORY") : "."; + testFile(srcDir + "/parsetest.txt"); TEST_DONE(); } diff --git a/searchlib/src/tests/fef/table/table_test.cpp b/searchlib/src/tests/fef/table/table_test.cpp index 2d05e0c7310..74fb37ab672 100644 --- a/searchlib/src/tests/fef/table/table_test.cpp +++ b/searchlib/src/tests/fef/table/table_test.cpp @@ -25,10 +25,22 @@ private: void testFunctionTableFactory(); void testTableManager(); + const std::string _srcDir; + const std::string _tables1Dir; + const std::string _tables2Dir; public: + TableTest(); int Main(); }; +TableTest::TableTest() : + vespalib::TestApp(), + _srcDir(getenv("SOURCE_DIRECTORY") ? getenv("SOURCE_DIRECTORY") : "."), + _tables1Dir(_srcDir + "/tables1"), + _tables2Dir(_srcDir + "/tables2") +{ +} + bool TableTest::assertTable(const Table & act, const Table & exp) { @@ -72,12 +84,12 @@ void TableTest::testFileTableFactory() { { - FileTableFactory ftf("tables1"); + FileTableFactory ftf(_tables1Dir); EXPECT_TRUE(assertCreateTable(ftf, "a", Table().add(1.5).add(2.25).add(3))); EXPECT_TRUE(ftf.createTable("b").get() == NULL); } { - FileTableFactory ftf("tables1/"); + FileTableFactory ftf(_tables1Dir); EXPECT_TRUE(ftf.createTable("a").get() != NULL); } } @@ -114,8 +126,8 @@ TableTest::testTableManager() { { TableManager tm; - tm.addFactory(ITableFactory::SP(new FileTableFactory("tables1"))); - tm.addFactory(ITableFactory::SP(new FileTableFactory("tables2"))); + tm.addFactory(ITableFactory::SP(new FileTableFactory(_tables1Dir))); + tm.addFactory(ITableFactory::SP(new FileTableFactory(_tables2Dir))); { const Table * t = tm.getTable("a"); // from tables1 diff --git a/searchlib/src/tests/grouping/grouping_serialization_test.cpp b/searchlib/src/tests/grouping/grouping_serialization_test.cpp index cb3a8281ae1..efc559a5bab 100644 --- a/searchlib/src/tests/grouping/grouping_serialization_test.cpp +++ b/searchlib/src/tests/grouping/grouping_serialization_test.cpp @@ -43,7 +43,8 @@ document::GlobalId getGlobalId(uint32_t docId) { struct Fixture { // Set WRITE_FILES to true to generate new expected serialization files. const bool WRITE_FILES = false; - const std::string file_path = "../../test/files/"; + const std::string src_dir = getenv("SOURCE_DIRECTORY") ? getenv("SOURCE_DIRECTORY") : "."; + const std::string file_path = src_dir + "/../../test/files/"; std::string file_name; std::ifstream file_stream; diff --git a/searchlib/src/tests/indexmetainfo/indexmetainfo_test.cpp b/searchlib/src/tests/indexmetainfo/indexmetainfo_test.cpp index e7dc828c9e5..4bd40863fc2 100644 --- a/searchlib/src/tests/indexmetainfo/indexmetainfo_test.cpp +++ b/searchlib/src/tests/indexmetainfo/indexmetainfo_test.cpp @@ -14,9 +14,11 @@ TEST_SETUP(Test) int Test::Main() { + const std::string srcDir = getenv("SOURCE_DIRECTORY") ? getenv("SOURCE_DIRECTORY") : "."; + TEST_INIT("indexmetainfo_test"); { // load pregenerated file - IndexMetaInfo info(""); + IndexMetaInfo info(srcDir); EXPECT_TRUE(info.load()); ASSERT_TRUE(info.snapshots().size() == 4); EXPECT_TRUE(info.snapshots()[0].valid); @@ -88,7 +90,7 @@ Test::Main() EXPECT_TRUE(!info.load("file-not-present.txt")); } { // load files with errors should fail - IndexMetaInfo info("."); + IndexMetaInfo info(srcDir); EXPECT_TRUE(!info.load("bogus1.txt")); EXPECT_TRUE(!info.load("bogus2.txt")); EXPECT_TRUE(!info.load("bogus3.txt")); diff --git a/searchlib/src/tests/transactionlog/CMakeLists.txt b/searchlib/src/tests/transactionlog/CMakeLists.txt index 7f358c15ba4..5275f30396d 100644 --- a/searchlib/src/tests/transactionlog/CMakeLists.txt +++ b/searchlib/src/tests/transactionlog/CMakeLists.txt @@ -5,4 +5,4 @@ vespa_add_executable(searchlib_translogclient_test_app TEST DEPENDS searchlib ) -vespa_add_test(NAME searchlib_translogclient_test_app COMMAND sh translogclient_test.sh) +vespa_add_test(NAME searchlib_translogclient_test_app COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/translogclient_test.sh) diff --git a/searchlib/src/tests/url/CMakeLists.txt b/searchlib/src/tests/url/CMakeLists.txt index f09ec7c9ca5..151b06e409b 100644 --- a/searchlib/src/tests/url/CMakeLists.txt +++ b/searchlib/src/tests/url/CMakeLists.txt @@ -5,4 +5,4 @@ vespa_add_executable(searchlib_testurl_app TEST DEPENDS searchlib ) -vespa_add_test(NAME searchlib_testurl_app COMMAND sh dotest.sh) +vespa_add_test(NAME searchlib_testurl_app COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/dotest.sh) |