diff options
author | Arnstein Ressem <aressem@gmail.com> | 2016-11-02 23:26:40 +0100 |
---|---|---|
committer | Arnstein Ressem <aressem@gmail.com> | 2016-11-02 23:26:40 +0100 |
commit | 99480b4d72abf3688060d7643816680a30963f74 (patch) | |
tree | 966d8494bca9292e6be2877d91ed838953856f0f /memfilepersistence | |
parent | 3d18773cf5357250cb2d35d6e8c13477db6e20a3 (diff) |
Removed TestApp::GetSourceDirectory
Diffstat (limited to 'memfilepersistence')
-rw-r--r-- | memfilepersistence/src/tests/device/partitionmonitortest.cpp | 14 | ||||
-rw-r--r-- | memfilepersistence/src/tests/helper/testhelper.cpp | 3 |
2 files changed, 8 insertions, 9 deletions
diff --git a/memfilepersistence/src/tests/device/partitionmonitortest.cpp b/memfilepersistence/src/tests/device/partitionmonitortest.cpp index 45eed305507..faa8451e4d1 100644 --- a/memfilepersistence/src/tests/device/partitionmonitortest.cpp +++ b/memfilepersistence/src/tests/device/partitionmonitortest.cpp @@ -63,7 +63,7 @@ struct FakeStatter : public PartitionMonitor::Statter { void PartitionMonitorTest::testNormalUsage() { - const std::string file_name = vespalib::TestApp::GetSourceDirectory() + "testrunner.cpp"; + const std::string file_name = TEST_PATH("testrunner.cpp"); PartitionMonitor monitor(file_name); FakeStatter* statter = new FakeStatter(); monitor.setStatter(std::unique_ptr<PartitionMonitor::Statter>(statter)); @@ -90,7 +90,7 @@ void PartitionMonitorTest::testNormalUsage() void PartitionMonitorTest::testHighInodeFillrate() { - const std::string file_name = vespalib::TestApp::GetSourceDirectory() + "testrunner.cpp"; + const std::string file_name = TEST_PATH("testrunner.cpp"); PartitionMonitor monitor(file_name); FakeStatter* statter = new FakeStatter(); statter->_info.f_favail = 2; @@ -118,7 +118,7 @@ void PartitionMonitorTest::testHighInodeFillrate() void PartitionMonitorTest::testAlwaysStatPolicy() { - PartitionMonitor monitor(vespalib::TestApp::GetSourceDirectory() + "testrunner.cpp"); + PartitionMonitor monitor(TEST_PATH("testrunner.cpp")); FakeStatter* statter = new FakeStatter(); monitor.setStatter(std::unique_ptr<PartitionMonitor::Statter>(statter)); monitor.setAlwaysStatPolicy(); @@ -130,7 +130,7 @@ void PartitionMonitorTest::testAlwaysStatPolicy() void PartitionMonitorTest::testPeriodPolicy() { - PartitionMonitor monitor(vespalib::TestApp::GetSourceDirectory() + "testrunner.cpp"); + PartitionMonitor monitor(TEST_PATH("testrunner.cpp")); FakeStatter* statter = new FakeStatter(); monitor.setStatter(std::unique_ptr<PartitionMonitor::Statter>(statter)); monitor.setStatPeriodPolicy(4); @@ -142,7 +142,7 @@ void PartitionMonitorTest::testPeriodPolicy() void PartitionMonitorTest::testStatOncePolicy() { - PartitionMonitor monitor(vespalib::TestApp::GetSourceDirectory() + "testrunner.cpp"); + PartitionMonitor monitor(TEST_PATH("testrunner.cpp")); FakeStatter* statter = new FakeStatter(); monitor.setStatter(std::unique_ptr<PartitionMonitor::Statter>(statter)); monitor.setStatOncePolicy(); @@ -154,7 +154,7 @@ void PartitionMonitorTest::testStatOncePolicy() void PartitionMonitorTest::testDynamicPolicy() { - PartitionMonitor monitor(vespalib::TestApp::GetSourceDirectory() + "testrunner.cpp"); + PartitionMonitor monitor(TEST_PATH("testrunner.cpp")); FakeStatter* statter = new FakeStatter(); monitor.setStatter(std::unique_ptr<PartitionMonitor::Statter>(statter)); monitor.setStatDynamicPolicy(2); @@ -180,7 +180,7 @@ void PartitionMonitorTest::testDynamicPolicy() void PartitionMonitorTest::testIsFull() { - PartitionMonitor monitor(vespalib::TestApp::GetSourceDirectory() + "testrunner.cpp"); + PartitionMonitor monitor(TEST_PATH("testrunner.cpp")); monitor.setMaxFillness(0.85); FakeStatter* statter = new FakeStatter(); monitor.setStatOncePolicy(); diff --git a/memfilepersistence/src/tests/helper/testhelper.cpp b/memfilepersistence/src/tests/helper/testhelper.cpp index 13950026b22..94fc21c5140 100644 --- a/memfilepersistence/src/tests/helper/testhelper.cpp +++ b/memfilepersistence/src/tests/helper/testhelper.cpp @@ -86,8 +86,7 @@ vdstestlib::DirConfig getStandardConfig(bool storagenode) { config->set("maxconcurrentvisitors_fixed", "4"); config->set("maxconcurrentvisitors_variable", "0"); config = &dc.addConfig("stor-visitordispatcher"); - addFileConfig(dc, "documenttypes", - vespalib::TestApp::GetSourceDirectory() + "config-doctypes.cfg"); + addFileConfig(dc, "documenttypes", TEST_PATH("config-doctypes.cfg")); addStorageDistributionConfig(dc); return dc; } |