diff options
| author | Dan Goodliffe <dan@randomdan.homeip.net> | 2022-02-15 02:10:05 +0000 |
|---|---|---|
| committer | Dan Goodliffe <dan@randomdan.homeip.net> | 2022-02-15 02:10:05 +0000 |
| commit | cd65db1972d02626773d3bba2a2020e1216ebf2e (patch) | |
| tree | 0996e4486e4f60e1d4477160a96f4ad93b517a7b | |
| parent | Fix IWYU on generated code (diff) | |
| download | icespider-cd65db1972d02626773d3bba2a2020e1216ebf2e.tar.bz2 icespider-cd65db1972d02626773d3bba2a2020e1216ebf2e.tar.xz icespider-cd65db1972d02626773d3bba2a2020e1216ebf2e.zip | |
Remove dependency of AdHocUtil internalsicespider-0.7
| -rw-r--r-- | icespider/unittests/testApp.cpp | 13 | ||||
| -rw-r--r-- | icespider/unittests/testCompile.cpp | 13 | ||||
| -rw-r--r-- | icespider/unittests/testPerf.cpp | 12 |
3 files changed, 20 insertions, 18 deletions
diff --git a/icespider/unittests/testApp.cpp b/icespider/unittests/testApp.cpp index d6a4a28..efd328d 100644 --- a/icespider/unittests/testApp.cpp +++ b/icespider/unittests/testApp.cpp @@ -38,12 +38,13 @@ namespace Ice { using namespace IceSpider; -static void forceEarlyChangeDir() __attribute__((constructor(101))); -void -forceEarlyChangeDir() -{ - std::filesystem::current_path(XSTR(ROOT)); -} +struct forceEarlyChangeDir { + forceEarlyChangeDir() + { + std::filesystem::current_path(rootDir); + } +}; +BOOST_TEST_GLOBAL_FIXTURE(forceEarlyChangeDir); BOOST_AUTO_TEST_CASE(testLoadConfiguration) { diff --git a/icespider/unittests/testCompile.cpp b/icespider/unittests/testCompile.cpp index 402143f..8d01113 100644 --- a/icespider/unittests/testCompile.cpp +++ b/icespider/unittests/testCompile.cpp @@ -19,12 +19,13 @@ using namespace IceSpider; -static void forceEarlyChangeDir() __attribute__((constructor(101))); -void -forceEarlyChangeDir() -{ - std::filesystem::current_path(XSTR(ROOT)); -} +struct forceEarlyChangeDir { + forceEarlyChangeDir() + { + std::filesystem::current_path(rootDir); + } +}; +BOOST_TEST_GLOBAL_FIXTURE(forceEarlyChangeDir); class CoreFixture { protected: diff --git a/icespider/unittests/testPerf.cpp b/icespider/unittests/testPerf.cpp index 5b82213..85abc92 100644 --- a/icespider/unittests/testPerf.cpp +++ b/icespider/unittests/testPerf.cpp @@ -60,7 +60,7 @@ class CoreFixture : public IceSpider::CoreWithDefaultRouter, public benchmark::F BENCHMARK_F(CoreFixture, script_name_root)(benchmark::State & state) { - CharPtrPtrArray env(XSTR(ROOT) "/fixtures/env1"); + CharPtrPtrArray env(rootDir / "fixtures/env1"); for (auto _ : state) { TestRequest r(this, &env.front()); } @@ -68,7 +68,7 @@ BENCHMARK_F(CoreFixture, script_name_root)(benchmark::State & state) BENCHMARK_F(CoreFixture, is_secure)(benchmark::State & state) { - CharPtrPtrArray env(XSTR(ROOT) "/fixtures/env1"); + CharPtrPtrArray env(rootDir / "fixtures/env1"); TestRequest r(this, &env.front()); for (auto _ : state) { benchmark::DoNotOptimize(r.isSecure()); @@ -77,7 +77,7 @@ BENCHMARK_F(CoreFixture, is_secure)(benchmark::State & state) BENCHMARK_F(CoreFixture, get_env_param)(benchmark::State & state) { - CharPtrPtrArray env(XSTR(ROOT) "/fixtures/env1"); + CharPtrPtrArray env(rootDir / "fixtures/env1"); TestRequest r(this, &env.front()); for (auto _ : state) { benchmark::DoNotOptimize(r.getEnv("REMOTE_PORT")); @@ -86,7 +86,7 @@ BENCHMARK_F(CoreFixture, get_env_param)(benchmark::State & state) BENCHMARK_F(CoreFixture, get_header_param)(benchmark::State & state) { - CharPtrPtrArray env(XSTR(ROOT) "/fixtures/env1"); + CharPtrPtrArray env(rootDir / "fixtures/env1"); TestRequest r(this, &env.front()); for (auto _ : state) { benchmark::DoNotOptimize(r.getHeaderParam("user_agent")); @@ -95,7 +95,7 @@ BENCHMARK_F(CoreFixture, get_header_param)(benchmark::State & state) BENCHMARK_F(CoreFixture, get_query_string_param)(benchmark::State & state) { - CharPtrPtrArray env(XSTR(ROOT) "/fixtures/env1"); + CharPtrPtrArray env(rootDir / "fixtures/env1"); TestRequest r(this, &env.front()); for (auto _ : state) { benchmark::DoNotOptimize(r.getQueryStringParam("utm_source")); @@ -104,7 +104,7 @@ BENCHMARK_F(CoreFixture, get_query_string_param)(benchmark::State & state) BENCHMARK_F(CoreFixture, get_cookie_param)(benchmark::State & state) { - CharPtrPtrArray env(XSTR(ROOT) "/fixtures/env1"); + CharPtrPtrArray env(rootDir / "fixtures/env1"); TestRequest r(this, &env.front()); for (auto _ : state) { benchmark::DoNotOptimize(r.getQueryStringParam("utm_source")); |