summaryrefslogtreecommitdiffstats
path: root/searchlib
diff options
context:
space:
mode:
authorHenning Baldersheim <balder@yahoo-inc.com>2019-09-30 11:35:02 +0200
committerGitHub <noreply@github.com>2019-09-30 11:35:02 +0200
commitf2bb48968d209e0567330bdeb11ea10aedf6a55c (patch)
tree2f4799a0af4f48ddb1a7f751f1571368e1de7504 /searchlib
parentf6c1fcdcdacbac64f9c5b6b519776c7c906f7d0b (diff)
parent34aa816e5be5470e0734d8245a6305022a5c99be (diff)
Merge pull request #10811 from vespa-engine/toregge/port-logdatastore-test-to-darwin
Port logdatastore unit test to Darwin.
Diffstat (limited to 'searchlib')
-rw-r--r--searchlib/src/tests/docstore/logdatastore/logdatastore_test.cpp5
-rwxr-xr-xsearchlib/src/tests/docstore/logdatastore/logdatastore_test.sh1
2 files changed, 4 insertions, 2 deletions
diff --git a/searchlib/src/tests/docstore/logdatastore/logdatastore_test.cpp b/searchlib/src/tests/docstore/logdatastore/logdatastore_test.cpp
index d636de46426..63c1b320fb8 100644
--- a/searchlib/src/tests/docstore/logdatastore/logdatastore_test.cpp
+++ b/searchlib/src/tests/docstore/logdatastore/logdatastore_test.cpp
@@ -131,6 +131,7 @@ checkStats(IDataStore &store,
}
+#ifdef __linux__
TEST("test that DirectIOPadding works accordng to spec") {
constexpr ssize_t FILE_SIZE = 4096*3;
FastOS_File file("directio.test");
@@ -199,6 +200,7 @@ TEST("test that DirectIOPadding works accordng to spec") {
EXPECT_TRUE(file.Close());
FastOS_File::Delete(file.GetFileName());
}
+#endif
TEST("testGrowing") {
FastOS_File::EmptyAndRemoveDirectory("growing");
@@ -287,6 +289,7 @@ TEST("testTruncatedIdxFile"){
}
const char * magic = "mumbo jumbo";
{
+ truncate("bug-7257706-truncated/1422358701368384000.idx", 3830);
LogDataStore datastore(executor, "bug-7257706-truncated", config, GrowStrategy(),
TuneFileSummary(), fileHeaderContext, tlSyncer, nullptr);
EXPECT_EQUAL(331ul, datastore.lastSyncToken());
@@ -843,7 +846,7 @@ struct Fixture {
Fixture(const vespalib::string &dirName = "tmp",
bool dirCleanup = true,
size_t maxFileSize = 4096 * 2)
- : executor(1, 0x10000),
+ : executor(1, 0x20000),
dir(dirName),
serialNum(0),
fileHeaderCtx(),
diff --git a/searchlib/src/tests/docstore/logdatastore/logdatastore_test.sh b/searchlib/src/tests/docstore/logdatastore/logdatastore_test.sh
index 45b3c804014..4aeea02efe2 100755
--- a/searchlib/src/tests/docstore/logdatastore/logdatastore_test.sh
+++ b/searchlib/src/tests/docstore/logdatastore/logdatastore_test.sh
@@ -23,7 +23,6 @@ cp -a $SOURCE_DIRECTORY/bug-7257706/1422358701368384000.idx incompletecompact-te
cp -a $SOURCE_DIRECTORY/bug-7257706/1422358701368384000.dat incompletecompact-test/2422358701368384000.dat
cp -a $SOURCE_DIRECTORY/bug-7257706/1422358701368384000.idx incompletecompact-test/2422358701368384000.idx
-truncate --size 3830 bug-7257706-truncated/1422358701368384000.idx
fail=0
VESPA_LOG_TARGET=file:vlog2.txt $VALGRIND ./searchlib_logdatastore_test_app || fail=1
rm -rf bug-7257706-truncated dangling-test incompletecompact-test