From bc0e45fb95959139208546c24391d21ffda7aa05 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Wed, 31 Jul 2019 13:04:25 +0200 Subject: [PATCH] DebugTools: clearer name for a define. --- src/Magnum/DebugTools/Test/CMakeLists.txt | 4 ++-- src/Magnum/DebugTools/Test/ScreenshotGLTest.cpp | 12 ++++++------ src/Magnum/DebugTools/Test/configure.h.cmake | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/Magnum/DebugTools/Test/CMakeLists.txt b/src/Magnum/DebugTools/Test/CMakeLists.txt index 535d197de..02eaaee11 100644 --- a/src/Magnum/DebugTools/Test/CMakeLists.txt +++ b/src/Magnum/DebugTools/Test/CMakeLists.txt @@ -29,10 +29,10 @@ if(WITH_TRADE) if(CORRADE_TARGET_EMSCRIPTEN OR CORRADE_TARGET_ANDROID) set(DEBUGTOOLS_TEST_DIR ".") - set(SCREENSHOT_TEST_DIR "write") + set(SCREENSHOTTEST_SAVE_DIR "write") else() set(DEBUGTOOLS_TEST_DIR ${CMAKE_CURRENT_SOURCE_DIR}) - set(SCREENSHOT_TEST_DIR ${CMAKE_CURRENT_BINARY_DIR}/write) + set(SCREENSHOTTEST_SAVE_DIR ${CMAKE_CURRENT_BINARY_DIR}/write) endif() # CMake before 3.8 has broken $ expressions for iOS (see diff --git a/src/Magnum/DebugTools/Test/ScreenshotGLTest.cpp b/src/Magnum/DebugTools/Test/ScreenshotGLTest.cpp index 3526fa889..bc12c8e11 100644 --- a/src/Magnum/DebugTools/Test/ScreenshotGLTest.cpp +++ b/src/Magnum/DebugTools/Test/ScreenshotGLTest.cpp @@ -122,11 +122,11 @@ void ScreenshotGLTest::rgba8() { CORRADE_COMPARE(framebuffer.checkStatus(GL::FramebufferTarget::Read), GL::Framebuffer::Status::Complete); - std::string file = Utility::Directory::join(SCREENSHOT_TEST_DIR, "image.tga"); + std::string file = Utility::Directory::join(SCREENSHOTTEST_SAVE_DIR, "image.tga"); if(Utility::Directory::exists(file)) CORRADE_VERIFY(Utility::Directory::rm(file)); else - CORRADE_VERIFY(Utility::Directory::mkpath(SCREENSHOT_TEST_DIR)); + CORRADE_VERIFY(Utility::Directory::mkpath(SCREENSHOTTEST_SAVE_DIR)); std::ostringstream out; bool succeeded; @@ -179,11 +179,11 @@ void ScreenshotGLTest::r8() { CORRADE_COMPARE(framebuffer.checkStatus(GL::FramebufferTarget::Read), GL::Framebuffer::Status::Complete); - std::string file = Utility::Directory::join(SCREENSHOT_TEST_DIR, "image.tga"); + std::string file = Utility::Directory::join(SCREENSHOTTEST_SAVE_DIR, "image.tga"); if(Utility::Directory::exists(file)) CORRADE_VERIFY(Utility::Directory::rm(file)); else - CORRADE_VERIFY(Utility::Directory::mkpath(SCREENSHOT_TEST_DIR)); + CORRADE_VERIFY(Utility::Directory::mkpath(SCREENSHOTTEST_SAVE_DIR)); std::ostringstream out; bool succeeded; @@ -230,7 +230,7 @@ void ScreenshotGLTest::unknownFormat() { bool succeeded; { Error redirectOutput{&out}; - succeeded = DebugTools::screenshot(_converterManager, framebuffer, Utility::Directory::join(SCREENSHOT_TEST_DIR, "image.tga")); + succeeded = DebugTools::screenshot(_converterManager, framebuffer, Utility::Directory::join(SCREENSHOTTEST_SAVE_DIR, "image.tga")); } MAGNUM_VERIFY_NO_GL_ERROR(); @@ -264,7 +264,7 @@ void ScreenshotGLTest::pluginLoadFailed() { { Error redirectOutput{&out}; PluginManager::Manager manager{"nowhere"}; - succeeded = DebugTools::screenshot(manager, framebuffer, Utility::Directory::join(SCREENSHOT_TEST_DIR, "image.poo")); + succeeded = DebugTools::screenshot(manager, framebuffer, Utility::Directory::join(SCREENSHOTTEST_SAVE_DIR, "image.poo")); } MAGNUM_VERIFY_NO_GL_ERROR(); diff --git a/src/Magnum/DebugTools/Test/configure.h.cmake b/src/Magnum/DebugTools/Test/configure.h.cmake index 780fe5f37..c457c75ca 100644 --- a/src/Magnum/DebugTools/Test/configure.h.cmake +++ b/src/Magnum/DebugTools/Test/configure.h.cmake @@ -28,4 +28,4 @@ #cmakedefine TGAIMAGECONVERTER_PLUGIN_FILENAME "${TGAIMAGECONVERTER_PLUGIN_FILENAME}" #cmakedefine TGAIMPORTER_PLUGIN_FILENAME "${TGAIMPORTER_PLUGIN_FILENAME}" #define DEBUGTOOLS_TEST_DIR "${DEBUGTOOLS_TEST_DIR}" -#define SCREENSHOT_TEST_DIR "${SCREENSHOT_TEST_DIR}" +#define SCREENSHOTTEST_SAVE_DIR "${SCREENSHOTTEST_SAVE_DIR}"