From 88f04152905fb4dc3aefe2ed7fa81681e24f15e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Fri, 12 Jun 2015 20:54:12 +0200 Subject: [PATCH] Support OpenGL tests also on Windows and OS X. I wanted to preserve the parameter-less constructor of tests, but WINAPI requires fairly ugly entagled set of functions, passing HWND around, which required storing it in a global var and hoping it is properly initialized when querying it for it to be passed to application constructor. When this was done, it was now fairly easy to support passing also argv/argc to application constructor, which in the future will enable selective disabling of extensions for even better test coverage. This however needed slightly different main() function and thus we now have MAGNUM_GL_TEST_MAIN() instead of CORRADE_TEST_MAIN(). Using the latter will result in an assert inside std::optional. --- CMakeLists.txt | 8 ++- .../Test/DistanceFieldVectorGLTest.cpp | 2 +- src/Magnum/Shaders/Test/FlatGLTest.cpp | 2 +- .../Shaders/Test/MeshVisualizerGLTest.cpp | 2 +- src/Magnum/Shaders/Test/PhongGLTest.cpp | 2 +- src/Magnum/Shaders/Test/VectorGLTest.cpp | 2 +- src/Magnum/Shaders/Test/VertexColorGLTest.cpp | 2 +- src/Magnum/Test/AbstractObjectGLTest.cpp | 2 +- src/Magnum/Test/AbstractOpenGLTester.h | 53 ++++++++++++++++--- src/Magnum/Test/AbstractQueryGLTest.cpp | 2 +- .../Test/AbstractShaderProgramGLTest.cpp | 2 +- src/Magnum/Test/AbstractTextureGLTest.cpp | 2 +- src/Magnum/Test/BufferGLTest.cpp | 2 +- src/Magnum/Test/BufferImageGLTest.cpp | 2 +- src/Magnum/Test/BufferTextureGLTest.cpp | 2 +- src/Magnum/Test/ContextGLTest.cpp | 2 +- src/Magnum/Test/CubeMapTextureArrayGLTest.cpp | 2 +- src/Magnum/Test/CubeMapTextureGLTest.cpp | 2 +- src/Magnum/Test/DebugOutputGLTest.cpp | 2 +- src/Magnum/Test/FramebufferGLTest.cpp | 2 +- src/Magnum/Test/MeshGLTest.cpp | 2 +- src/Magnum/Test/MultisampleTextureGLTest.cpp | 2 +- src/Magnum/Test/PrimitiveQueryGLTest.cpp | 2 +- src/Magnum/Test/RectangleTextureGLTest.cpp | 2 +- src/Magnum/Test/RenderbufferGLTest.cpp | 2 +- src/Magnum/Test/SampleQueryGLTest.cpp | 2 +- src/Magnum/Test/ShaderGLTest.cpp | 2 +- src/Magnum/Test/TextureArrayGLTest.cpp | 2 +- src/Magnum/Test/TextureGLTest.cpp | 2 +- src/Magnum/Test/TimeQueryGLTest.cpp | 2 +- src/Magnum/Test/TransformFeedbackGLTest.cpp | 2 +- src/Magnum/Text/Test/GlyphCacheGLTest.cpp | 2 +- src/Magnum/Text/Test/RendererGLTest.cpp | 2 +- .../MagnumFont/Test/MagnumFontGLTest.cpp | 2 +- .../Test/MagnumFontConverterGLTest.cpp | 2 +- 35 files changed, 86 insertions(+), 41 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8d55bca3d..9da519f79 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -176,9 +176,15 @@ if(TARGET_DESKTOP_GLES) endif() if(BUILD_GL_TESTS) - if(UNIX AND (NOT MAGNUM_TARGET_GLES OR MAGNUM_TARGET_DESKTOP_GLES)) + if(CORRADE_TARGET_APPLE) + set(WITH_WINDOWLESSCGLAPPLICATION ON) + set(GL_TEST_LIBRARIES Magnum MagnumWindowlessCglApplication) + elseif(CORRADE_TARGET_UNIX AND (NOT MAGNUM_TARGET_GLES OR MAGNUM_TARGET_DESKTOP_GLES)) set(WITH_WINDOWLESSGLXAPPLICATION ON) set(GL_TEST_LIBRARIES Magnum MagnumWindowlessGlxApplication) + elseif(CORRADE_TARGET_WINDOWS) + set(WITH_WINDOWLESSWGLAPPLICATION ON) + set(GL_TEST_LIBRARIES Magnum MagnumWindowlessWglApplication) else() message(FATAL_ERROR "Cannot run tests for OpenGL code on this platform. Set BUILD_GL_TESTS to OFF to skip building them.") endif() diff --git a/src/Magnum/Shaders/Test/DistanceFieldVectorGLTest.cpp b/src/Magnum/Shaders/Test/DistanceFieldVectorGLTest.cpp index c208d6d6f..680f8e133 100644 --- a/src/Magnum/Shaders/Test/DistanceFieldVectorGLTest.cpp +++ b/src/Magnum/Shaders/Test/DistanceFieldVectorGLTest.cpp @@ -52,4 +52,4 @@ void DistanceFieldVectorGLTest::compile3D() { }}} -CORRADE_TEST_MAIN(Magnum::Shaders::Test::DistanceFieldVectorGLTest) +MAGNUM_GL_TEST_MAIN(Magnum::Shaders::Test::DistanceFieldVectorGLTest) diff --git a/src/Magnum/Shaders/Test/FlatGLTest.cpp b/src/Magnum/Shaders/Test/FlatGLTest.cpp index 7383f7e2e..2991b5a67 100644 --- a/src/Magnum/Shaders/Test/FlatGLTest.cpp +++ b/src/Magnum/Shaders/Test/FlatGLTest.cpp @@ -66,4 +66,4 @@ void FlatGLTest::compile3DTextured() { }}} -CORRADE_TEST_MAIN(Magnum::Shaders::Test::FlatGLTest) +MAGNUM_GL_TEST_MAIN(Magnum::Shaders::Test::FlatGLTest) diff --git a/src/Magnum/Shaders/Test/MeshVisualizerGLTest.cpp b/src/Magnum/Shaders/Test/MeshVisualizerGLTest.cpp index 7cd6ca48c..0f3141f5b 100644 --- a/src/Magnum/Shaders/Test/MeshVisualizerGLTest.cpp +++ b/src/Magnum/Shaders/Test/MeshVisualizerGLTest.cpp @@ -68,4 +68,4 @@ void MeshVisualizerGLTest::compileWireframeNoGeometryShader() { }}} -CORRADE_TEST_MAIN(Magnum::Shaders::Test::MeshVisualizerGLTest) +MAGNUM_GL_TEST_MAIN(Magnum::Shaders::Test::MeshVisualizerGLTest) diff --git a/src/Magnum/Shaders/Test/PhongGLTest.cpp b/src/Magnum/Shaders/Test/PhongGLTest.cpp index 0b52d0038..ccdbb33d4 100644 --- a/src/Magnum/Shaders/Test/PhongGLTest.cpp +++ b/src/Magnum/Shaders/Test/PhongGLTest.cpp @@ -94,4 +94,4 @@ void PhongGLTest::compileAmbientDiffuseSpecularTexture() { }}} -CORRADE_TEST_MAIN(Magnum::Shaders::Test::PhongGLTest) +MAGNUM_GL_TEST_MAIN(Magnum::Shaders::Test::PhongGLTest) diff --git a/src/Magnum/Shaders/Test/VectorGLTest.cpp b/src/Magnum/Shaders/Test/VectorGLTest.cpp index c83c93c16..ca78e7150 100644 --- a/src/Magnum/Shaders/Test/VectorGLTest.cpp +++ b/src/Magnum/Shaders/Test/VectorGLTest.cpp @@ -52,4 +52,4 @@ void VectorGLTest::compile3D() { }}} -CORRADE_TEST_MAIN(Magnum::Shaders::Test::VectorGLTest) +MAGNUM_GL_TEST_MAIN(Magnum::Shaders::Test::VectorGLTest) diff --git a/src/Magnum/Shaders/Test/VertexColorGLTest.cpp b/src/Magnum/Shaders/Test/VertexColorGLTest.cpp index 67a65d9dd..05b568c39 100644 --- a/src/Magnum/Shaders/Test/VertexColorGLTest.cpp +++ b/src/Magnum/Shaders/Test/VertexColorGLTest.cpp @@ -52,4 +52,4 @@ void VertexColorGLTest::compile3D() { }}} -CORRADE_TEST_MAIN(Magnum::Shaders::Test::VertexColorGLTest) +MAGNUM_GL_TEST_MAIN(Magnum::Shaders::Test::VertexColorGLTest) diff --git a/src/Magnum/Test/AbstractObjectGLTest.cpp b/src/Magnum/Test/AbstractObjectGLTest.cpp index 21649eb44..1c1441b5a 100644 --- a/src/Magnum/Test/AbstractObjectGLTest.cpp +++ b/src/Magnum/Test/AbstractObjectGLTest.cpp @@ -52,4 +52,4 @@ void AbstractObjectGLTest::labelNoOp() { }} -CORRADE_TEST_MAIN(Magnum::Test::AbstractObjectGLTest) +MAGNUM_GL_TEST_MAIN(Magnum::Test::AbstractObjectGLTest) diff --git a/src/Magnum/Test/AbstractOpenGLTester.h b/src/Magnum/Test/AbstractOpenGLTester.h index 1f663b9ed..c427357fa 100644 --- a/src/Magnum/Test/AbstractOpenGLTester.h +++ b/src/Magnum/Test/AbstractOpenGLTester.h @@ -32,26 +32,33 @@ #include "Magnum/DebugOutput.h" #include "Magnum/Renderer.h" -#if !defined(MAGNUM_TARGET_GLES) || defined(MAGNUM_TARGET_DESKTOP_GLES) +#if defined(CORRADE_TARGET_APPLE) +#include "Magnum/Platform/WindowlessCglApplication.h" +#elif defined(CORRADE_TARGET_UNIX) && (!defined(MAGNUM_TARGET_GLES) || defined(MAGNUM_TARGET_DESKTOP_GLES)) #include "Magnum/Platform/WindowlessGlxApplication.h" +#elif defined(CORRADE_TARGET_WINDOWS) +#include "Magnum/Platform/WindowlessWglApplication.h" #else #error cannot run OpenGL tests on this platform #endif namespace Magnum { namespace Test { -class AbstractOpenGLTester: public TestSuite::Tester, public Platform::WindowlessApplication { +class AbstractOpenGLTester: public TestSuite::Tester { public: explicit AbstractOpenGLTester(); - using TestSuite::Tester::exec; - int exec() override final { return TestSuite::Tester::exec(); } + /* Private use only */ + static std::optional _windowlessApplicationArguments; private: - static int _zero; + struct WindowlessApplication: Platform::WindowlessApplication { + explicit WindowlessApplication(const Arguments& arguments): Platform::WindowlessApplication{arguments} {} + int exec() override final { return 0; } + } _windowlessApplication; }; -AbstractOpenGLTester::AbstractOpenGLTester(): Platform::WindowlessApplication({_zero, nullptr}) { +AbstractOpenGLTester::AbstractOpenGLTester(): _windowlessApplication{*_windowlessApplicationArguments} { if(Context::current()->isExtensionSupported()) { Renderer::enable(Renderer::Feature::DebugOutput); Renderer::enable(Renderer::Feature::DebugOutputSynchronous); @@ -62,10 +69,42 @@ AbstractOpenGLTester::AbstractOpenGLTester(): Platform::WindowlessApplication({_ } } -int AbstractOpenGLTester::_zero = 0; +std::optional AbstractOpenGLTester::_windowlessApplicationArguments; #define MAGNUM_VERIFY_NO_ERROR() CORRADE_COMPARE(Magnum::Renderer::error(), Magnum::Renderer::Error::NoError) +#ifndef CORRADE_TARGET_WINDOWS +#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(); \ + } +#else +#define MAGNUM_GL_TEST_MAIN(Class) \ + LRESULT CALLBACK windowProcedure(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam); \ + LRESULT CALLBACK windowProcedure(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) { \ + int ret = 0; \ + switch(message) { \ + case WM_CREATE: \ + { \ + Magnum::Test::AbstractOpenGLTester::_windowlessApplicationArguments->window = hWnd; \ + Class t; \ + t.registerTest(__FILE__, #Class); \ + PostQuitMessage(ret = t.exec()); \ + } \ + break; \ + default: return DefWindowProc(hWnd, message, wParam, lParam); \ + } \ + return ret; \ + } \ + int main(int argc, char** argv) { \ + Magnum::Test::AbstractOpenGLTester::_windowlessApplicationArguments.emplace(argc, argv, nullptr); \ + return Magnum::Platform::WindowlessWglApplication::create(windowProcedure); \ + } +#endif + }} #endif diff --git a/src/Magnum/Test/AbstractQueryGLTest.cpp b/src/Magnum/Test/AbstractQueryGLTest.cpp index a433899b2..a4553b24a 100644 --- a/src/Magnum/Test/AbstractQueryGLTest.cpp +++ b/src/Magnum/Test/AbstractQueryGLTest.cpp @@ -143,4 +143,4 @@ void AbstractQueryGLTest::label() { }} -CORRADE_TEST_MAIN(Magnum::Test::AbstractQueryGLTest) +MAGNUM_GL_TEST_MAIN(Magnum::Test::AbstractQueryGLTest) diff --git a/src/Magnum/Test/AbstractShaderProgramGLTest.cpp b/src/Magnum/Test/AbstractShaderProgramGLTest.cpp index f47a75f82..b3ec345b8 100644 --- a/src/Magnum/Test/AbstractShaderProgramGLTest.cpp +++ b/src/Magnum/Test/AbstractShaderProgramGLTest.cpp @@ -383,4 +383,4 @@ void AbstractShaderProgramGLTest::uniformArray() { }} -CORRADE_TEST_MAIN(Magnum::Test::AbstractShaderProgramGLTest) +MAGNUM_GL_TEST_MAIN(Magnum::Test::AbstractShaderProgramGLTest) diff --git a/src/Magnum/Test/AbstractTextureGLTest.cpp b/src/Magnum/Test/AbstractTextureGLTest.cpp index dd04a2c38..ed75c9907 100644 --- a/src/Magnum/Test/AbstractTextureGLTest.cpp +++ b/src/Magnum/Test/AbstractTextureGLTest.cpp @@ -105,4 +105,4 @@ void AbstractTextureGLTest::label() { }} -CORRADE_TEST_MAIN(Magnum::Test::AbstractTextureGLTest) +MAGNUM_GL_TEST_MAIN(Magnum::Test::AbstractTextureGLTest) diff --git a/src/Magnum/Test/BufferGLTest.cpp b/src/Magnum/Test/BufferGLTest.cpp index 476728ce3..9559e4c19 100644 --- a/src/Magnum/Test/BufferGLTest.cpp +++ b/src/Magnum/Test/BufferGLTest.cpp @@ -438,4 +438,4 @@ void BufferGLTest::invalidate() { }} -CORRADE_TEST_MAIN(Magnum::Test::BufferGLTest) +MAGNUM_GL_TEST_MAIN(Magnum::Test::BufferGLTest) diff --git a/src/Magnum/Test/BufferImageGLTest.cpp b/src/Magnum/Test/BufferImageGLTest.cpp index 218d226d3..a6ee551e1 100644 --- a/src/Magnum/Test/BufferImageGLTest.cpp +++ b/src/Magnum/Test/BufferImageGLTest.cpp @@ -138,4 +138,4 @@ void BufferImageGLTest::setData() { }} -CORRADE_TEST_MAIN(Magnum::Test::BufferImageGLTest) +MAGNUM_GL_TEST_MAIN(Magnum::Test::BufferImageGLTest) diff --git a/src/Magnum/Test/BufferTextureGLTest.cpp b/src/Magnum/Test/BufferTextureGLTest.cpp index af0fc1874..f3f83b6f4 100644 --- a/src/Magnum/Test/BufferTextureGLTest.cpp +++ b/src/Magnum/Test/BufferTextureGLTest.cpp @@ -147,4 +147,4 @@ void BufferTextureGLTest::setBufferOffset() { }} -CORRADE_TEST_MAIN(Magnum::Test::BufferTextureGLTest) +MAGNUM_GL_TEST_MAIN(Magnum::Test::BufferTextureGLTest) diff --git a/src/Magnum/Test/ContextGLTest.cpp b/src/Magnum/Test/ContextGLTest.cpp index 0b5a29708..5a05b6bee 100644 --- a/src/Magnum/Test/ContextGLTest.cpp +++ b/src/Magnum/Test/ContextGLTest.cpp @@ -109,4 +109,4 @@ void ContextGLTest::isExtensionDisabled() { }} -CORRADE_TEST_MAIN(Magnum::Test::ContextGLTest) +MAGNUM_GL_TEST_MAIN(Magnum::Test::ContextGLTest) diff --git a/src/Magnum/Test/CubeMapTextureArrayGLTest.cpp b/src/Magnum/Test/CubeMapTextureArrayGLTest.cpp index 9cee85630..c8a42fbab 100644 --- a/src/Magnum/Test/CubeMapTextureArrayGLTest.cpp +++ b/src/Magnum/Test/CubeMapTextureArrayGLTest.cpp @@ -486,4 +486,4 @@ void CubeMapTextureArrayGLTest::invalidateSubImage() { }} -CORRADE_TEST_MAIN(Magnum::Test::CubeMapTextureArrayGLTest) +MAGNUM_GL_TEST_MAIN(Magnum::Test::CubeMapTextureArrayGLTest) diff --git a/src/Magnum/Test/CubeMapTextureGLTest.cpp b/src/Magnum/Test/CubeMapTextureGLTest.cpp index 6d9adf2a8..05d58c547 100644 --- a/src/Magnum/Test/CubeMapTextureGLTest.cpp +++ b/src/Magnum/Test/CubeMapTextureGLTest.cpp @@ -591,4 +591,4 @@ void CubeMapTextureGLTest::invalidateSubImage() { }} -CORRADE_TEST_MAIN(Magnum::Test::CubeMapTextureGLTest) +MAGNUM_GL_TEST_MAIN(Magnum::Test::CubeMapTextureGLTest) diff --git a/src/Magnum/Test/DebugOutputGLTest.cpp b/src/Magnum/Test/DebugOutputGLTest.cpp index 00c0c6136..370db947d 100644 --- a/src/Magnum/Test/DebugOutputGLTest.cpp +++ b/src/Magnum/Test/DebugOutputGLTest.cpp @@ -175,4 +175,4 @@ void DebugOutputGLTest::groupFallback() { }} -CORRADE_TEST_MAIN(Magnum::Test::DebugOutputGLTest) +MAGNUM_GL_TEST_MAIN(Magnum::Test::DebugOutputGLTest) diff --git a/src/Magnum/Test/FramebufferGLTest.cpp b/src/Magnum/Test/FramebufferGLTest.cpp index 8b3cfe6de..bff01c6dc 100644 --- a/src/Magnum/Test/FramebufferGLTest.cpp +++ b/src/Magnum/Test/FramebufferGLTest.cpp @@ -988,4 +988,4 @@ void FramebufferGLTest::blit() { }} -CORRADE_TEST_MAIN(Magnum::Test::FramebufferGLTest) +MAGNUM_GL_TEST_MAIN(Magnum::Test::FramebufferGLTest) diff --git a/src/Magnum/Test/MeshGLTest.cpp b/src/Magnum/Test/MeshGLTest.cpp index 70ee2ba09..72dc4bb53 100644 --- a/src/Magnum/Test/MeshGLTest.cpp +++ b/src/Magnum/Test/MeshGLTest.cpp @@ -1862,4 +1862,4 @@ void MeshGLTest::multiDrawBaseVertex() { }} -CORRADE_TEST_MAIN(Magnum::Test::MeshGLTest) +MAGNUM_GL_TEST_MAIN(Magnum::Test::MeshGLTest) diff --git a/src/Magnum/Test/MultisampleTextureGLTest.cpp b/src/Magnum/Test/MultisampleTextureGLTest.cpp index 81fc8b257..e22fe4c3b 100644 --- a/src/Magnum/Test/MultisampleTextureGLTest.cpp +++ b/src/Magnum/Test/MultisampleTextureGLTest.cpp @@ -323,4 +323,4 @@ void MultisampleTextureGLTest::invalidateSubImage2DArray() { }} -CORRADE_TEST_MAIN(Magnum::Test::MultisampleTextureGLTest) +MAGNUM_GL_TEST_MAIN(Magnum::Test::MultisampleTextureGLTest) diff --git a/src/Magnum/Test/PrimitiveQueryGLTest.cpp b/src/Magnum/Test/PrimitiveQueryGLTest.cpp index d1abbc657..73d0f9cf5 100644 --- a/src/Magnum/Test/PrimitiveQueryGLTest.cpp +++ b/src/Magnum/Test/PrimitiveQueryGLTest.cpp @@ -192,4 +192,4 @@ void PrimitiveQueryGLTest::transformFeedbackPrimitivesWritten() { }} -CORRADE_TEST_MAIN(Magnum::Test::PrimitiveQueryGLTest) +MAGNUM_GL_TEST_MAIN(Magnum::Test::PrimitiveQueryGLTest) diff --git a/src/Magnum/Test/RectangleTextureGLTest.cpp b/src/Magnum/Test/RectangleTextureGLTest.cpp index b0eff3d16..164f1a4e0 100644 --- a/src/Magnum/Test/RectangleTextureGLTest.cpp +++ b/src/Magnum/Test/RectangleTextureGLTest.cpp @@ -394,4 +394,4 @@ void RectangleTextureGLTest::invalidateSubImage() { }} -CORRADE_TEST_MAIN(Magnum::Test::RectangleTextureGLTest) +MAGNUM_GL_TEST_MAIN(Magnum::Test::RectangleTextureGLTest) diff --git a/src/Magnum/Test/RenderbufferGLTest.cpp b/src/Magnum/Test/RenderbufferGLTest.cpp index 153d56911..6eb2e015e 100644 --- a/src/Magnum/Test/RenderbufferGLTest.cpp +++ b/src/Magnum/Test/RenderbufferGLTest.cpp @@ -186,4 +186,4 @@ void RenderbufferGLTest::setStorageMultisample() { }} -CORRADE_TEST_MAIN(Magnum::Test::RenderbufferGLTest) +MAGNUM_GL_TEST_MAIN(Magnum::Test::RenderbufferGLTest) diff --git a/src/Magnum/Test/SampleQueryGLTest.cpp b/src/Magnum/Test/SampleQueryGLTest.cpp index 27ae11e4c..d218c2fd3 100644 --- a/src/Magnum/Test/SampleQueryGLTest.cpp +++ b/src/Magnum/Test/SampleQueryGLTest.cpp @@ -241,4 +241,4 @@ void SampleQueryGLTest::conditionalRender() { }} -CORRADE_TEST_MAIN(Magnum::Test::SampleQueryGLTest) +MAGNUM_GL_TEST_MAIN(Magnum::Test::SampleQueryGLTest) diff --git a/src/Magnum/Test/ShaderGLTest.cpp b/src/Magnum/Test/ShaderGLTest.cpp index b090f6859..8351123f4 100644 --- a/src/Magnum/Test/ShaderGLTest.cpp +++ b/src/Magnum/Test/ShaderGLTest.cpp @@ -225,4 +225,4 @@ void ShaderGLTest::compile() { }} -CORRADE_TEST_MAIN(Magnum::Test::ShaderGLTest) +MAGNUM_GL_TEST_MAIN(Magnum::Test::ShaderGLTest) diff --git a/src/Magnum/Test/TextureArrayGLTest.cpp b/src/Magnum/Test/TextureArrayGLTest.cpp index ea22a4dcd..57d0a957a 100644 --- a/src/Magnum/Test/TextureArrayGLTest.cpp +++ b/src/Magnum/Test/TextureArrayGLTest.cpp @@ -1047,4 +1047,4 @@ void TextureArrayGLTest::invalidateSubImage2D() { }} -CORRADE_TEST_MAIN(Magnum::Test::TextureArrayGLTest) +MAGNUM_GL_TEST_MAIN(Magnum::Test::TextureArrayGLTest) diff --git a/src/Magnum/Test/TextureGLTest.cpp b/src/Magnum/Test/TextureGLTest.cpp index d1fea809a..b2dcd6ba0 100644 --- a/src/Magnum/Test/TextureGLTest.cpp +++ b/src/Magnum/Test/TextureGLTest.cpp @@ -1396,4 +1396,4 @@ void TextureGLTest::invalidateSubImage3D() { }} -CORRADE_TEST_MAIN(Magnum::Test::TextureGLTest) +MAGNUM_GL_TEST_MAIN(Magnum::Test::TextureGLTest) diff --git a/src/Magnum/Test/TimeQueryGLTest.cpp b/src/Magnum/Test/TimeQueryGLTest.cpp index eb4fea632..31d2d99cc 100644 --- a/src/Magnum/Test/TimeQueryGLTest.cpp +++ b/src/Magnum/Test/TimeQueryGLTest.cpp @@ -132,4 +132,4 @@ void TimeQueryGLTest::queryTimestamp() { }} -CORRADE_TEST_MAIN(Magnum::Test::TimeQueryGLTest) +MAGNUM_GL_TEST_MAIN(Magnum::Test::TimeQueryGLTest) diff --git a/src/Magnum/Test/TransformFeedbackGLTest.cpp b/src/Magnum/Test/TransformFeedbackGLTest.cpp index f894ec75c..04e151330 100644 --- a/src/Magnum/Test/TransformFeedbackGLTest.cpp +++ b/src/Magnum/Test/TransformFeedbackGLTest.cpp @@ -456,4 +456,4 @@ void TransformFeedbackGLTest::interleaved() { }} -CORRADE_TEST_MAIN(Magnum::Test::TransformFeedbackGLTest) +MAGNUM_GL_TEST_MAIN(Magnum::Test::TransformFeedbackGLTest) diff --git a/src/Magnum/Text/Test/GlyphCacheGLTest.cpp b/src/Magnum/Text/Test/GlyphCacheGLTest.cpp index 8ce9999d2..b860849ec 100644 --- a/src/Magnum/Text/Test/GlyphCacheGLTest.cpp +++ b/src/Magnum/Text/Test/GlyphCacheGLTest.cpp @@ -93,4 +93,4 @@ void GlyphCacheGLTest::reserve() { }}} -CORRADE_TEST_MAIN(Magnum::Text::Test::GlyphCacheGLTest) +MAGNUM_GL_TEST_MAIN(Magnum::Text::Test::GlyphCacheGLTest) diff --git a/src/Magnum/Text/Test/RendererGLTest.cpp b/src/Magnum/Text/Test/RendererGLTest.cpp index 8dac14e65..03b4cd39a 100644 --- a/src/Magnum/Text/Test/RendererGLTest.cpp +++ b/src/Magnum/Text/Test/RendererGLTest.cpp @@ -430,4 +430,4 @@ void RendererGLTest::multiline() { }}} -CORRADE_TEST_MAIN(Magnum::Text::Test::RendererGLTest) +MAGNUM_GL_TEST_MAIN(Magnum::Text::Test::RendererGLTest) diff --git a/src/MagnumPlugins/MagnumFont/Test/MagnumFontGLTest.cpp b/src/MagnumPlugins/MagnumFont/Test/MagnumFontGLTest.cpp index 6935f55e3..b35720265 100644 --- a/src/MagnumPlugins/MagnumFont/Test/MagnumFontGLTest.cpp +++ b/src/MagnumPlugins/MagnumFont/Test/MagnumFontGLTest.cpp @@ -106,4 +106,4 @@ void MagnumFontGLTest::createGlyphCache() { }}} -CORRADE_TEST_MAIN(Magnum::Text::Test::MagnumFontGLTest) +MAGNUM_GL_TEST_MAIN(Magnum::Text::Test::MagnumFontGLTest) diff --git a/src/MagnumPlugins/MagnumFontConverter/Test/MagnumFontConverterGLTest.cpp b/src/MagnumPlugins/MagnumFontConverter/Test/MagnumFontConverterGLTest.cpp index 61de0bad9..56c3ccf6c 100644 --- a/src/MagnumPlugins/MagnumFontConverter/Test/MagnumFontConverterGLTest.cpp +++ b/src/MagnumPlugins/MagnumFontConverter/Test/MagnumFontConverterGLTest.cpp @@ -123,4 +123,4 @@ void MagnumFontConverterGLTest::exportFont() { }}} -CORRADE_TEST_MAIN(Magnum::Text::Test::MagnumFontConverterGLTest) +MAGNUM_GL_TEST_MAIN(Magnum::Text::Test::MagnumFontConverterGLTest)