diff options
Diffstat (limited to '')
-rw-r--r-- | .appveyor.yml | 16 | ||||
-rw-r--r-- | test/call_stack.cpp | 2 | ||||
-rw-r--r-- | test/test_lib.cpp | 4 | ||||
-rw-r--r-- | test/test_lib.hpp | 4 | ||||
-rw-r--r-- | test/unit_tests/dbghelp.cpp | 2 | ||||
-rw-r--r-- | test/unit_tests/fixtures.hpp | 2 |
6 files changed, 15 insertions, 15 deletions
diff --git a/.appveyor.yml b/.appveyor.yml index 72ca13e..1b98d3a 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -38,16 +38,16 @@ after_build: test_script: - '"%install_dir%\bin\test\unit_tests.exe" --log_level=all' - - '"%install_dir%\bin\enum_symbols.exe" --pdb "%install_dir%\bin\test\test_lib.pdb" --mask "test::*"' - - ps: '$(& "$env:install_dir\bin\enum_symbols.exe" --pdb "$env:install_dir\bin\test\test_lib.pdb" | Select-String -Pattern "test::baz" -SimpleMatch -Quiet) -or $(throw "test::baz not enumerated among the symbols")' - - ps: '$(& "$env:install_dir\bin\enum_symbols.exe" --pdb "$env:install_dir\bin\test\test_lib.pdb" | Select-String -Pattern "test::bar" -SimpleMatch -Quiet) -or $(throw "test::bar not enumerated among the symbols")' - - ps: '$(& "$env:install_dir\bin\enum_symbols.exe" --pdb "$env:install_dir\bin\test\test_lib.pdb" | Select-String -Pattern "test::foo" -SimpleMatch -Quiet) -or $(throw "test::foo not enumerated among the symbols")' - - ps: '$(& "$env:install_dir\bin\enum_symbols.exe" --pdb "$env:install_dir\bin\test\test_lib.pdb" | Select-String -Pattern "test::var" -SimpleMatch -Quiet) -or $(throw "test::var not enumerated among the symbols")' + - '"%install_dir%\bin\enum_symbols.exe" --pdb "%install_dir%\bin\test\test_lib.pdb" --mask "test_ns::*"' + - ps: '$(& "$env:install_dir\bin\enum_symbols.exe" --pdb "$env:install_dir\bin\test\test_lib.pdb" | Select-String -Pattern "test_ns::baz" -SimpleMatch -Quiet) -or $(throw "test_ns::baz not enumerated among the symbols")' + - ps: '$(& "$env:install_dir\bin\enum_symbols.exe" --pdb "$env:install_dir\bin\test\test_lib.pdb" | Select-String -Pattern "test_ns::bar" -SimpleMatch -Quiet) -or $(throw "test_ns::bar not enumerated among the symbols")' + - ps: '$(& "$env:install_dir\bin\enum_symbols.exe" --pdb "$env:install_dir\bin\test\test_lib.pdb" | Select-String -Pattern "test_ns::foo" -SimpleMatch -Quiet) -or $(throw "test_ns::foo not enumerated among the symbols")' + - ps: '$(& "$env:install_dir\bin\enum_symbols.exe" --pdb "$env:install_dir\bin\test\test_lib.pdb" | Select-String -Pattern "test_ns::var" -SimpleMatch -Quiet) -or $(throw "test_ns::var not enumerated among the symbols")' - '"%install_dir%\bin\test\call_stack.exe"' - - ps: '$(& "$env:install_dir\bin\test\call_stack.exe" | Select-String -Pattern "[test_lib!test::baz" -SimpleMatch -Quiet) -or $(throw "test::baz not found in the call stack")' - - ps: '$(& "$env:install_dir\bin\test\call_stack.exe" | Select-String -Pattern "[test_lib!test::bar" -SimpleMatch -Quiet) -or $(throw "test::bar not found in the call stack")' - - ps: '$(& "$env:install_dir\bin\test\call_stack.exe" | Select-String -Pattern "[test_lib!test::foo" -SimpleMatch -Quiet) -or $(throw "test::foo not found in the call stack")' + - ps: '$(& "$env:install_dir\bin\test\call_stack.exe" | Select-String -Pattern "[test_lib!test_ns::baz" -SimpleMatch -Quiet) -or $(throw "test_ns::baz not found in the call stack")' + - ps: '$(& "$env:install_dir\bin\test\call_stack.exe" | Select-String -Pattern "[test_lib!test_ns::bar" -SimpleMatch -Quiet) -or $(throw "test_ns::bar not found in the call stack")' + - ps: '$(& "$env:install_dir\bin\test\call_stack.exe" | Select-String -Pattern "[test_lib!test_ns::foo" -SimpleMatch -Quiet) -or $(throw "test_ns::foo not found in the call stack")' for: # Only build Release builds on master to speed things up: diff --git a/test/call_stack.cpp b/test/call_stack.cpp index e14f744..06b9ed5 100644 --- a/test/call_stack.cpp +++ b/test/call_stack.cpp @@ -6,7 +6,7 @@ int main() { try { - test::print_call_stack(); + test_ns::print_call_stack(); } catch (const std::exception& e) { boost::nowide::cerr << e.what() << '\n'; return 1; diff --git a/test/test_lib.cpp b/test/test_lib.cpp index 19c0d32..63e51ad 100644 --- a/test/test_lib.cpp +++ b/test/test_lib.cpp @@ -9,7 +9,7 @@ #pragma optimize("", off) #endif -namespace test { +namespace test_ns { namespace { void do_print_call_stack() { @@ -41,4 +41,4 @@ void print_call_stack() { foo(&do_print_call_stack); } -} // namespace test +} // namespace test_ns diff --git a/test/test_lib.hpp b/test/test_lib.hpp index f5fa017..cf7b841 100644 --- a/test/test_lib.hpp +++ b/test/test_lib.hpp @@ -4,7 +4,7 @@ #include "test_lib_api.hpp" -namespace test { +namespace test_ns { typedef void (*F)(); @@ -16,4 +16,4 @@ TEST_LIB_API void baz(F); TEST_LIB_API void print_call_stack(); -} // namespace test +} // namespace test_ns diff --git a/test/unit_tests/dbghelp.cpp b/test/unit_tests/dbghelp.cpp index aab292f..4346bf7 100644 --- a/test/unit_tests/dbghelp.cpp +++ b/test/unit_tests/dbghelp.cpp @@ -46,7 +46,7 @@ BOOST_AUTO_TEST_CASE(enum_symbols) { BOOST_AUTO_TEST_CASE(call_stack) { try { - test::foo(&throw_call_stack); + test_ns::foo(&throw_call_stack); } catch (const pdb::CallStack& call_stack) { BOOST_TEST(true, "Caught the call stack"); return; diff --git a/test/unit_tests/fixtures.hpp b/test/unit_tests/fixtures.hpp index f6571d1..eb7dcc0 100644 --- a/test/unit_tests/fixtures.hpp +++ b/test/unit_tests/fixtures.hpp @@ -39,7 +39,7 @@ public: DbgHelpWithSymbols() { load_test_lib_pdb(); } static const std::string& get_namespace() { - static const std::string name{"test"}; + static const std::string name{"test_ns"}; return name; } |