diff options
Diffstat (limited to 'vbench/src/tests')
6 files changed, 8 insertions, 8 deletions
diff --git a/vbench/src/tests/app_vbench/CMakeLists.txt b/vbench/src/tests/app_vbench/CMakeLists.txt index c8970393a60..c5e57a8505e 100644 --- a/vbench/src/tests/app_vbench/CMakeLists.txt +++ b/vbench/src/tests/app_vbench/CMakeLists.txt @@ -7,3 +7,4 @@ vespa_add_executable(vbench_app_vbench_test_app TEST vbench ) vespa_add_test(NAME vbench_app_vbench_test_app NO_VALGRIND COMMAND vbench_app_vbench_test_app) +configure_file(vbench.cfg.template vbench.cfg @ONLY)
\ No newline at end of file diff --git a/vbench/src/tests/app_vbench/app_vbench_test.cpp b/vbench/src/tests/app_vbench/app_vbench_test.cpp index 87461702075..37b613210a0 100644 --- a/vbench/src/tests/app_vbench/app_vbench_test.cpp +++ b/vbench/src/tests/app_vbench/app_vbench_test.cpp @@ -48,7 +48,6 @@ TEST_MT_F("run vbench", 2, ServerSocket()) { } } else { std::string out; - EXPECT_TRUE(SlaveProc::run("cp vbench.cfg.template vbench.cfg")); EXPECT_TRUE(SlaveProc::run(strfmt("sed -i 's/_LOCAL_PORT_/%d/' vbench.cfg", f1.port()).c_str())); EXPECT_TRUE(SlaveProc::run("../../apps/vbench/vbench_app run vbench.cfg 2> vbench.out", out)); fprintf(stderr, "%s\n", out.c_str()); diff --git a/vbench/src/tests/app_vbench/vbench.cfg.template b/vbench/src/tests/app_vbench/vbench.cfg.template index de8e30a7fbe..950d5151780 100644 --- a/vbench/src/tests/app_vbench/vbench.cfg.template +++ b/vbench/src/tests/app_vbench/vbench.cfg.template @@ -2,14 +2,14 @@ http_threads: 32, inputs: [ { - source: { type: 'RequestGenerator', file: 'input.txt' }, + source: { type: 'RequestGenerator', file: '@CMAKE_CURRENT_SOURCE_DIR@/input.txt' }, prepare: [ { type: 'ServerTagger', host: 'localhost', port:_LOCAL_PORT_ }, { type: 'QpsTagger', qps: 10 } ] }, { - source: { type: 'RequestGenerator', file: 'input.txt' }, + source: { type: 'RequestGenerator', file: '@CMAKE_CURRENT_SOURCE_DIR@/input.txt' }, prepare: [ { type: 'ServerTagger', host: 'localhost', port:_LOCAL_PORT_ }, { type: 'QpsTagger', qps: 10 } diff --git a/vbench/src/tests/input_file_reader/input_file_reader_test.cpp b/vbench/src/tests/input_file_reader/input_file_reader_test.cpp index 2cf59dff1ec..bb39dcceafd 100644 --- a/vbench/src/tests/input_file_reader/input_file_reader_test.cpp +++ b/vbench/src/tests/input_file_reader/input_file_reader_test.cpp @@ -10,7 +10,7 @@ TEST("input file reader") { EXPECT_TRUE(reader.tainted()); } { - InputFileReader reader("simple_test_input.txt"); + InputFileReader reader(vespalib::TestApp::GetSourceDirectory() + "simple_test_input.txt"); EXPECT_TRUE(!reader.tainted()); string line; EXPECT_TRUE(reader.readLine(line)); @@ -23,7 +23,7 @@ TEST("input file reader") { TEST_FLUSH(); } { - InputFileReader reader("hard_test_input.txt"); + InputFileReader reader(vespalib::TestApp::GetSourceDirectory() + "hard_test_input.txt"); EXPECT_TRUE(!reader.tainted()); string line; EXPECT_TRUE(reader.readLine(line)); diff --git a/vbench/src/tests/mapped_file_input/mapped_file_input_test.cpp b/vbench/src/tests/mapped_file_input/mapped_file_input_test.cpp index 5044f5401e1..facd70b20ce 100644 --- a/vbench/src/tests/mapped_file_input/mapped_file_input_test.cpp +++ b/vbench/src/tests/mapped_file_input/mapped_file_input_test.cpp @@ -10,7 +10,7 @@ TEST("mapped file input") { EXPECT_TRUE(file.tainted()); } { - MappedFileInput file("file.txt"); + MappedFileInput file(vespalib::TestApp::GetSourceDirectory() + "file.txt"); EXPECT_TRUE(!file.tainted()); LineReader reader(file, 3); string line; diff --git a/vbench/src/tests/request_generator/request_generator_test.cpp b/vbench/src/tests/request_generator/request_generator_test.cpp index 52aca22954c..bdaf3fee75e 100644 --- a/vbench/src/tests/request_generator/request_generator_test.cpp +++ b/vbench/src/tests/request_generator/request_generator_test.cpp @@ -4,7 +4,7 @@ using namespace vbench; -TEST_FF("generate request", RequestReceptor(), RequestGenerator("input.txt", f1)) { +TEST_FF("generate request", RequestReceptor(), RequestGenerator(vespalib::TestApp::GetSourceDirectory() + "input.txt", f1)) { f2.run(); ASSERT_TRUE(f1.request.get() != 0); EXPECT_EQUAL("/this/is/url", f1.request->url()); @@ -17,7 +17,7 @@ TEST_FF("input not found", RequestReceptor(), RequestGenerator("no_such_input.tx EXPECT_TRUE(f2.tainted()); } -TEST_FF("abort request generation", RequestReceptor(), RequestGenerator("input.txt", f1)) { +TEST_FF("abort request generation", RequestReceptor(), RequestGenerator(vespalib::TestApp::GetSourceDirectory() + "input.txt", f1)) { f2.abort(); f2.run(); EXPECT_TRUE(f1.request.get() == 0); |