summaryrefslogtreecommitdiffstats
path: root/searchlib
diff options
context:
space:
mode:
authorHenning Baldersheim <balder@yahoo-inc.com>2016-06-28 09:21:46 +0200
committerGitHub <noreply@github.com>2016-06-28 09:21:46 +0200
commit28b725a978c1fb7dbda8f06e93c6d603314b3c15 (patch)
treeee6b19c22e302a2f249103a777d36a7611a6ca6e /searchlib
parenta662ef45cfb2952079b3f17c9063599863b4344d (diff)
parent251b5dcb7ada0ab659718eecdc6aaad5be400ca0 (diff)
Merge pull request #230 from yahoo/arnej/avoid-port-clash
do not use same port in two tests
Diffstat (limited to 'searchlib')
-rw-r--r--searchlib/src/tests/transactionlog/CMakeLists.txt7
-rw-r--r--searchlib/src/tests/transactionlog/translogserver_test.cpp19
2 files changed, 0 insertions, 26 deletions
diff --git a/searchlib/src/tests/transactionlog/CMakeLists.txt b/searchlib/src/tests/transactionlog/CMakeLists.txt
index 1b59b5834f8..7f358c15ba4 100644
--- a/searchlib/src/tests/transactionlog/CMakeLists.txt
+++ b/searchlib/src/tests/transactionlog/CMakeLists.txt
@@ -1,11 +1,4 @@
# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-vespa_add_executable(searchlib_translogserver_test_app TEST
- SOURCES
- translogserver_test.cpp
- DEPENDS
- searchlib
-)
-vespa_add_test(NAME searchlib_translogserver_test_app COMMAND searchlib_translogserver_test_app)
vespa_add_executable(searchlib_translogclient_test_app TEST
SOURCES
translogclient_test.cpp
diff --git a/searchlib/src/tests/transactionlog/translogserver_test.cpp b/searchlib/src/tests/transactionlog/translogserver_test.cpp
deleted file mode 100644
index fa03e4f5291..00000000000
--- a/searchlib/src/tests/transactionlog/translogserver_test.cpp
+++ /dev/null
@@ -1,19 +0,0 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-#include <vespa/fastos/fastos.h>
-#include <vespa/searchlib/transactionlog/translogserver.h>
-#include <vespa/searchlib/index/dummyfileheadercontext.h>
-
-using search::index::DummyFileHeaderContext;
-using search::transactionlog::TransLogServer;
-
-
-int main(int argc, char *argv[])
-{
- if ((argc > 1) && (argv[0] != NULL)) {
- DummyFileHeaderContext::setCreator(argv[0]);
- }
- DummyFileHeaderContext fileHeaderContext;
- TransLogServer tls("test7", 18377, ".", fileHeaderContext, 0x10000);
- sleep(60);
- return 0;
-}