aboutsummaryrefslogtreecommitdiffstats
path: root/searchlib
diff options
context:
space:
mode:
authorArnstein Ressem <aressem@gmail.com>2016-08-15 15:38:23 +0200
committerVegard Sjonfjell <vegardsjo@gmail.com>2016-08-15 15:38:23 +0200
commitd15dc62521c5cf26455216fa5eb3c3fe0b5c8ada (patch)
tree195f7d2b2392d07ec6e1c2b9dc14a7a965ecc65c /searchlib
parente534ad2c12af07da88b8264c2be189f5f686e927 (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 'searchlib')
-rw-r--r--searchlib/src/tests/attribute/changevector/CMakeLists.txt2
-rwxr-xr-x[-rw-r--r--]searchlib/src/tests/attribute/changevector/changevector_test.sh0
-rw-r--r--searchlib/src/tests/attribute/extendattributes/CMakeLists.txt2
-rw-r--r--searchlib/src/tests/attribute/guard/CMakeLists.txt2
-rwxr-xr-x[-rw-r--r--]searchlib/src/tests/attribute/guard/attributeguard_test.sh0
-rw-r--r--searchlib/src/tests/attribute/postinglistattribute/CMakeLists.txt2
-rw-r--r--searchlib/src/tests/attribute/searchcontext/CMakeLists.txt2
-rw-r--r--searchlib/src/tests/attribute/stringattribute/CMakeLists.txt2
-rw-r--r--searchlib/src/tests/attribute/tensorattribute/CMakeLists.txt2
-rwxr-xr-x[-rw-r--r--]searchlib/src/tests/attribute/tensorattribute/tensorattribute_test.sh0
-rw-r--r--searchlib/src/tests/datastore/CMakeLists.txt2
-rw-r--r--searchlib/src/tests/datastore/logdatastore_test.cpp3
-rwxr-xr-xsearchlib/src/tests/datastore/logdatastore_test.sh15
-rw-r--r--searchlib/src/tests/diskindex/fieldwriter/CMakeLists.txt2
-rw-r--r--searchlib/src/tests/diskindex/fusion/CMakeLists.txt2
-rw-r--r--searchlib/src/tests/features/CMakeLists.txt2
-rw-r--r--searchlib/src/tests/fef/featurenameparser/featurenameparser_test.cpp3
-rw-r--r--searchlib/src/tests/fef/table/table_test.cpp20
-rw-r--r--searchlib/src/tests/grouping/grouping_serialization_test.cpp3
-rw-r--r--searchlib/src/tests/indexmetainfo/indexmetainfo_test.cpp6
-rw-r--r--searchlib/src/tests/transactionlog/CMakeLists.txt2
-rw-r--r--searchlib/src/tests/url/CMakeLists.txt2
22 files changed, 49 insertions, 27 deletions
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)