diff options
Diffstat (limited to 'netfs/unittests/testGlacier.cpp')
| -rw-r--r-- | netfs/unittests/testGlacier.cpp | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/netfs/unittests/testGlacier.cpp b/netfs/unittests/testGlacier.cpp index 8c9a79c..b21b7e6 100644 --- a/netfs/unittests/testGlacier.cpp +++ b/netfs/unittests/testGlacier.cpp @@ -4,14 +4,8 @@ #include "mockFuse.h" #include <boost/filesystem/path.hpp> #include <boost/scope_exit.hpp> +#include <definedDirs.h> -#ifndef ROOT -#error "ROOT needs to be defined at compilation time" -#endif - -#define XSTR(s) STR(s) -#define STR(s) #s -const boost::filesystem::path RootDir(XSTR(ROOT)); const std::string testEndpoint("tcp -h localhost -p 12013"); BOOST_AUTO_TEST_CASE ( withRouter ) @@ -26,11 +20,11 @@ BOOST_AUTO_TEST_CASE ( withRouter ) { MockDaemonHost daemon(testEndpoint, { - "--NetFSD.ConfigPath=" + (RootDir / "defaultDaemon.xml").string() + "--NetFSD.ConfigPath=" + (rootDir / "defaultDaemon.xml").string() }); FuseMockHost fuse(testEndpoint, { - (RootDir / "defaultFuse.xml:testvol").string(), - (RootDir / "test").string(), + (rootDir / "defaultFuse.xml:testvol").string(), + (rootDir / "test").string(), "--Ice.Default.Router=Glacier2/router:tcp -h localhost -p 14063" }); |