summaryrefslogtreecommitdiffstats
path: root/juniper
diff options
context:
space:
mode:
authorArnstein Ressem <aressem@gmail.com>2016-11-02 23:26:40 +0100
committerArnstein Ressem <aressem@gmail.com>2016-11-02 23:26:40 +0100
commit99480b4d72abf3688060d7643816680a30963f74 (patch)
tree966d8494bca9292e6be2877d91ed838953856f0f /juniper
parent3d18773cf5357250cb2d35d6e8c13477db6e20a3 (diff)
Removed TestApp::GetSourceDirectory
Diffstat (limited to 'juniper')
-rw-r--r--juniper/src/test/SrcTestSuite.cpp2
-rw-r--r--juniper/src/test/auxTestApp.cpp2
-rw-r--r--juniper/src/test/matchobjectTestApp.cpp2
-rw-r--r--juniper/src/test/mcandTestApp.cpp2
-rw-r--r--juniper/src/test/queryparserTestApp.cpp2
5 files changed, 5 insertions, 5 deletions
diff --git a/juniper/src/test/SrcTestSuite.cpp b/juniper/src/test/SrcTestSuite.cpp
index 42dbe6e4a5e..1134192d085 100644
--- a/juniper/src/test/SrcTestSuite.cpp
+++ b/juniper/src/test/SrcTestSuite.cpp
@@ -59,7 +59,7 @@ public:
};
int SrcTestSuiteApp::Main() {
- juniper::TestEnv te(this, (GetSourceDirectory() + "../rpclient/testclient.rc").c_str());
+ juniper::TestEnv te(this, TEST_PATH("../rpclient/testclient.rc").c_str());
SrcTestSuite suite;
suite.Run();
long failures = suite.Report();
diff --git a/juniper/src/test/auxTestApp.cpp b/juniper/src/test/auxTestApp.cpp
index 50b367f99ec..63e9a0e6c5b 100644
--- a/juniper/src/test/auxTestApp.cpp
+++ b/juniper/src/test/auxTestApp.cpp
@@ -21,7 +21,7 @@ void Usage(char* s)
int AuxTestApp::Main()
{
- juniper::TestEnv te(this, (GetSourceDirectory() + "../rpclient/testclient.rc").c_str());
+ juniper::TestEnv te(this, TEST_PATH("../rpclient/testclient.rc").c_str());
AuxTest pta;
pta.SetStream(&std::cout);
pta.Run(_argc, _argv);
diff --git a/juniper/src/test/matchobjectTestApp.cpp b/juniper/src/test/matchobjectTestApp.cpp
index 9c9786969be..620d461372d 100644
--- a/juniper/src/test/matchobjectTestApp.cpp
+++ b/juniper/src/test/matchobjectTestApp.cpp
@@ -32,7 +32,7 @@ LOG_SETUP("matchobjectTest");
class MatchObjectTestApp : public vespalib::TestApp {
public:
virtual int Main() {
- juniper::TestEnv te(this, (GetSourceDirectory() + "../rpclient/testclient.rc").c_str());
+ juniper::TestEnv te(this, TEST_PATH("../rpclient/testclient.rc").c_str());
MatchObjectTest test;
test.SetStream(&std::cout);
test.Run(_argc, _argv);
diff --git a/juniper/src/test/mcandTestApp.cpp b/juniper/src/test/mcandTestApp.cpp
index fb331ac2b2a..268224ed195 100644
--- a/juniper/src/test/mcandTestApp.cpp
+++ b/juniper/src/test/mcandTestApp.cpp
@@ -32,7 +32,7 @@ LOG_SETUP("mcandTest");
class MatchCandidateTestApp : public vespalib::TestApp {
public:
virtual int Main() {
- juniper::TestEnv te(this, (GetSourceDirectory() + "../rpclient/testclient.rc").c_str());
+ juniper::TestEnv te(this, TEST_PATH("../rpclient/testclient.rc").c_str());
MatchCandidateTest test;
test.SetStream(&std::cout);
test.Run(_argc, _argv);
diff --git a/juniper/src/test/queryparserTestApp.cpp b/juniper/src/test/queryparserTestApp.cpp
index 6391885599a..20537028fb9 100644
--- a/juniper/src/test/queryparserTestApp.cpp
+++ b/juniper/src/test/queryparserTestApp.cpp
@@ -32,7 +32,7 @@ LOG_SETUP("queryparserTest");
class QueryParserTestApp : public vespalib::TestApp {
public:
virtual int Main() {
- juniper::TestEnv te(this, (GetSourceDirectory() + "../rpclient/testclient.rc").c_str());
+ juniper::TestEnv te(this, TEST_PATH("../rpclient/testclient.rc").c_str());
QueryParserTest test;
test.SetStream(&std::cout);
test.Run(_argc, _argv);