diff options
author | Arnstein Ressem <aressem@gmail.com> | 2016-08-23 15:10:36 +0200 |
---|---|---|
committer | Vegard Sjonfjell <vegardsjo@gmail.com> | 2016-08-23 15:10:36 +0200 |
commit | 55e5a91901109161186e05d3a6e959e06958bbba (patch) | |
tree | f312bab2c60207ee305dbcfa047fcc4fa8fd2dc1 /juniper/src/test/mcandTestApp.cpp | |
parent | d337a29392fb752dc725e4aea5efa0cc0df5f17a (diff) |
Aressem/cmake more out of source tests (#441)
* vespalib tests run out of source.
* staging_vespalib run tests out of source.
* fastos tests run out of source.
* Fixed storage tests out of source.
* Fixed some of the config tests.
* config* tests run out of source.
* document_* tests run out of source.
* documentapi_ tests run out of source.
* Fixed fsa out of source tests.
* Fix jrt_test out of source.
* More tests run out of source.
* Fix some slobrok and messagebus tests.
* More fixes for out of source tests.
* Done with first pass of regular tests out of source.
* Only use SOURCE_DIRECTORY in a limited set of places.
* Fix some remaining tests.
* Some cleanups.
* No need for extra slash.
Diffstat (limited to 'juniper/src/test/mcandTestApp.cpp')
-rw-r--r-- | juniper/src/test/mcandTestApp.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/juniper/src/test/mcandTestApp.cpp b/juniper/src/test/mcandTestApp.cpp index 7bbc9681d21..fb331ac2b2a 100644 --- a/juniper/src/test/mcandTestApp.cpp +++ b/juniper/src/test/mcandTestApp.cpp @@ -18,6 +18,7 @@ ****************************************************************************/ #include <vespa/fastos/fastos.h> #include <vespa/log/log.h> +#include <vespa/vespalib/testkit/testapp.h> LOG_SETUP("mcandTest"); #include "mcandTest.h" #include "testenv.h" @@ -28,10 +29,10 @@ LOG_SETUP("mcandTest"); * * @sa MatchCandidate @author Knut Omang */ -class MatchCandidateTestApp : public FastOS_Application { +class MatchCandidateTestApp : public vespalib::TestApp { public: virtual int Main() { - juniper::TestEnv te(this, "../rpclient/testclient.rc"); + juniper::TestEnv te(this, (GetSourceDirectory() + "../rpclient/testclient.rc").c_str()); MatchCandidateTest test; test.SetStream(&std::cout); test.Run(_argc, _argv); |