From 772ae8406219c4c8c8ceb93a54a18e583e5c2efc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Fri, 13 Jan 2017 17:02:14 +0100 Subject: [PATCH] Test: adapt AbstractOpenGLTester to changes in Corrade::TestSuite. --- src/Magnum/Test/AbstractOpenGLTester.h | 25 ++----------------------- 1 file changed, 2 insertions(+), 23 deletions(-) diff --git a/src/Magnum/Test/AbstractOpenGLTester.h b/src/Magnum/Test/AbstractOpenGLTester.h index ef84d20bd..ff4fd3685 100644 --- a/src/Magnum/Test/AbstractOpenGLTester.h +++ b/src/Magnum/Test/AbstractOpenGLTester.h @@ -60,9 +60,6 @@ class AbstractOpenGLTester: public TestSuite::Tester { public: explicit AbstractOpenGLTester(); - /* Private use only */ - static std::optional _windowlessApplicationArguments; - private: struct WindowlessApplication: Platform::WindowlessApplication { explicit WindowlessApplication(const Arguments& arguments): Platform::WindowlessApplication{arguments, NoCreate} {} @@ -74,7 +71,7 @@ class AbstractOpenGLTester: public TestSuite::Tester { } _windowlessApplication; }; -AbstractOpenGLTester::AbstractOpenGLTester(): TestSuite::Tester{TestSuite::Tester::TesterConfiguration{}.setSkippedArgumentPrefixes({"magnum"})}, _windowlessApplication{*_windowlessApplicationArguments} { +AbstractOpenGLTester::AbstractOpenGLTester(): TestSuite::Tester{TestSuite::Tester::TesterConfiguration{}.setSkippedArgumentPrefixes({"magnum"})}, _windowlessApplication{{arguments().first, arguments().second}} { /* Try to create debug context, fallback to normal one if not possible. No such thing on OSX or iOS. */ #ifndef CORRADE_TARGET_APPLE @@ -94,27 +91,9 @@ AbstractOpenGLTester::AbstractOpenGLTester(): TestSuite::Tester{TestSuite::Teste } } -std::optional AbstractOpenGLTester::_windowlessApplicationArguments; - #define MAGNUM_VERIFY_NO_ERROR() CORRADE_COMPARE(Magnum::Renderer::error(), Magnum::Renderer::Error::NoError) -#ifdef CORRADE_TESTSUITE_TARGET_XCTEST -#define MAGNUM_GL_TEST_MAIN(Class) \ - int CORRADE_VISIBILITY_EXPORT corradeTestMain(int argc, char** argv) { \ - Magnum::Test::AbstractOpenGLTester::_windowlessApplicationArguments.emplace(argc, argv); \ - Class t; \ - t.registerTest(__FILE__, #Class); \ - return t.exec(argc, argv); \ - } -#else -#define MAGNUM_GL_TEST_MAIN(Class) \ - int main(int argc, char** argv) { \ - Magnum::Test::AbstractOpenGLTester::_windowlessApplicationArguments.emplace(argc, argv); \ - Class t; \ - t.registerTest(__FILE__, #Class); \ - return t.exec(argc, argv); \ - } -#endif +#define MAGNUM_GL_TEST_MAIN(Class) CORRADE_TEST_MAIN(Class) }}