Browse Source

AnyImageConverter: rename a test macro for clarity.

pull/527/head
Vladimír Vondruš 5 years ago
parent
commit
50e75f90c8
  1. 6
      src/MagnumPlugins/AnyImageConverter/Test/AnyImageConverterTest.cpp
  2. 4
      src/MagnumPlugins/AnyImageConverter/Test/CMakeLists.txt
  3. 2
      src/MagnumPlugins/AnyImageConverter/Test/configure.h.cmake

6
src/MagnumPlugins/AnyImageConverter/Test/AnyImageConverterTest.cpp

@ -107,7 +107,7 @@ AnyImageConverterTest::AnyImageConverterTest() {
#endif
/* Create the output directory if it doesn't exist yet */
CORRADE_INTERNAL_ASSERT_OUTPUT(Utility::Directory::mkpath(ANYIMAGECONVERTER_TEST_DIR));
CORRADE_INTERNAL_ASSERT_OUTPUT(Utility::Directory::mkpath(ANYIMAGECONVERTER_TEST_OUTPUT_DIR));
}
constexpr const char Data[] = {
@ -125,7 +125,7 @@ void AnyImageConverterTest::convert2D() {
if(!(_manager.loadState("TgaImageConverter") & PluginManager::LoadState::Loaded))
CORRADE_SKIP("TgaImageConverter plugin not enabled, cannot test");
const std::string filename = Utility::Directory::join(ANYIMAGECONVERTER_TEST_DIR, data.filename);
const std::string filename = Utility::Directory::join(ANYIMAGECONVERTER_TEST_OUTPUT_DIR, data.filename);
if(Utility::Directory::exists(filename))
CORRADE_VERIFY(Utility::Directory::rm(filename));
@ -181,7 +181,7 @@ void AnyImageConverterTest::propagateFlags2D() {
if(!(_manager.loadState("TgaImageConverter") & PluginManager::LoadState::Loaded))
CORRADE_SKIP("TgaImageConverter plugin not enabled, cannot test");
const std::string filename = Utility::Directory::join(ANYIMAGECONVERTER_TEST_DIR, "output.tga");
const std::string filename = Utility::Directory::join(ANYIMAGECONVERTER_TEST_OUTPUT_DIR, "output.tga");
if(Utility::Directory::exists(filename))
CORRADE_VERIFY(Utility::Directory::rm(filename));

4
src/MagnumPlugins/AnyImageConverter/Test/CMakeLists.txt

@ -24,9 +24,9 @@
#
if(CORRADE_TARGET_EMSCRIPTEN OR CORRADE_TARGET_ANDROID)
set(ANYIMAGECONVERTER_TEST_DIR "write")
set(ANYIMAGECONVERTER_TEST_OUTPUT_DIR "write")
else()
set(ANYIMAGECONVERTER_TEST_DIR ${CMAKE_CURRENT_BINARY_DIR})
set(ANYIMAGECONVERTER_TEST_OUTPUT_DIR ${CMAKE_CURRENT_BINARY_DIR})
endif()
# CMake before 3.8 has broken $<TARGET_FILE*> expressions for iOS (see

2
src/MagnumPlugins/AnyImageConverter/Test/configure.h.cmake

@ -25,4 +25,4 @@
#cmakedefine ANYIMAGECONVERTER_PLUGIN_FILENAME "${ANYIMAGECONVERTER_PLUGIN_FILENAME}"
#cmakedefine TGAIMAGECONVERTER_PLUGIN_FILENAME "${TGAIMAGECONVERTER_PLUGIN_FILENAME}"
#define ANYIMAGECONVERTER_TEST_DIR "${ANYIMAGECONVERTER_TEST_DIR}"
#define ANYIMAGECONVERTER_TEST_OUTPUT_DIR "${ANYIMAGECONVERTER_TEST_OUTPUT_DIR}"

Loading…
Cancel
Save