ic
/
magnum
mirror of https://github.com/mosra/magnum.git
6
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Bundle test files for both Android and Emscripten.

pull/187/head^2
Vladimír Vondruš 10 years ago
parent
261c573557
commit
081f79a766
5 changed files with 79 additions and 70 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 19
      src/Magnum/Text/Test/CMakeLists.txt
  2. 14
      src/Magnum/Trade/Test/CMakeLists.txt
  3. 29
      src/MagnumPlugins/ObjImporter/Test/CMakeLists.txt
  4. 12
      src/MagnumPlugins/TgaImporter/Test/CMakeLists.txt
  5. 75
      src/MagnumPlugins/WavAudioImporter/Test/CMakeLists.txt

19
src/Magnum/Text/Test/CMakeLists.txt
Unescape View File

@ -23,9 +23,9 @@
# DEALINGS IN THE SOFTWARE.
#
if(CORRADE_TARGET_EMSCRIPTEN)
set(TEXT_TEST_DIR "")
set(TEXT_TEST_OUTPUT_DIR "/write")
if(CORRADE_TARGET_EMSCRIPTEN OR CORRADE_TARGET_ANDROID)
set(TEXT_TEST_DIR ".")
set(TEXT_TEST_OUTPUT_DIR "./write")
else()
set(TEXT_TEST_DIR ${CMAKE_CURRENT_SOURCE_DIR})
set(TEXT_TEST_OUTPUT_DIR ${CMAKE_CURRENT_BINARY_DIR})
@ -34,17 +34,16 @@ endif()
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/configure.h.cmake
${CMAKE_CURRENT_BINARY_DIR}/configure.h)
corrade_add_test(TextAbstractFontTest AbstractFontTest.cpp LIBRARIES Magnum MagnumText)
corrade_add_test(TextAbstractFontTest AbstractFontTest.cpp
LIBRARIES Magnum MagnumText
FILES data.bin)
target_include_directories(TextAbstractFontTest PRIVATE ${CMAKE_CURRENT_BINARY_DIR})
corrade_add_test(TextAbstractFontConverterTest AbstractFontConverterTest.cpp LIBRARIES Magnum MagnumText)
corrade_add_test(TextAbstractFontConverterTest AbstractFontConverterTest.cpp
LIBRARIES Magnum MagnumText
FILES data.bin)
target_include_directories(TextAbstractFontConverterTest PRIVATE ${CMAKE_CURRENT_BINARY_DIR})
corrade_add_test(TextAbstractLayouterTest AbstractLayouterTest.cpp LIBRARIES Magnum MagnumText)
if(CORRADE_TARGET_EMSCRIPTEN)
emscripten_embed_file(TextAbstractFontTest data.bin "/data.bin")
emscripten_embed_file(TextAbstractFontConverterTest data.bin "/data.bin")
endif()
if(BUILD_GL_TESTS)
corrade_add_test(TextGlyphCacheGLTest GlyphCacheGLTest.cpp LIBRARIES MagnumText ${GL_TEST_LIBRARIES})
corrade_add_test(TextRendererGLTest RendererGLTest.cpp LIBRARIES MagnumText ${GL_TEST_LIBRARIES})

14
src/Magnum/Trade/Test/CMakeLists.txt
Unescape View File

@ -23,9 +23,9 @@
# DEALINGS IN THE SOFTWARE.
#
if(CORRADE_TARGET_EMSCRIPTEN)
set(TRADE_TEST_DIR "")
set(TRADE_TEST_OUTPUT_DIR "/write")
if(CORRADE_TARGET_EMSCRIPTEN OR CORRADE_TARGET_ANDROID)
set(TRADE_TEST_DIR ".")
set(TRADE_TEST_OUTPUT_DIR "./write")
else()
set(TRADE_TEST_DIR ${CMAKE_CURRENT_SOURCE_DIR})
set(TRADE_TEST_OUTPUT_DIR ${CMAKE_CURRENT_BINARY_DIR})
@ -36,7 +36,9 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/configure.h.cmake
corrade_add_test(TradeAbstractImageConverterTest AbstractImageConverterTest.cpp LIBRARIES Magnum)
target_include_directories(TradeAbstractImageConverterTest PRIVATE ${CMAKE_CURRENT_BINARY_DIR})
corrade_add_test(TradeAbstractImporterTest AbstractImporterTest.cpp LIBRARIES Magnum)
corrade_add_test(TradeAbstractImporterTest AbstractImporterTest.cpp
LIBRARIES Magnum
FILES file.bin)
target_include_directories(TradeAbstractImporterTest PRIVATE ${CMAKE_CURRENT_BINARY_DIR})
corrade_add_test(TradeCameraDataTest CameraDataTest.cpp LIBRARIES Magnum)
corrade_add_test(TradeImageDataTest ImageDataTest.cpp LIBRARIES Magnum)
@ -48,7 +50,3 @@ corrade_add_test(TradeObjectData2DTest ObjectData2DTest.cpp LIBRARIES Magnum)
corrade_add_test(TradeObjectData3DTest ObjectData3DTest.cpp LIBRARIES Magnum)
corrade_add_test(TradeSceneDataTest SceneDataTest.cpp LIBRARIES Magnum)
corrade_add_test(TradeTextureDataTest TextureDataTest.cpp LIBRARIES Magnum)
if(CORRADE_TARGET_EMSCRIPTEN)
emscripten_embed_file(TradeAbstractImporterTest file.bin "/file.bin")
endif()

29
src/MagnumPlugins/ObjImporter/Test/CMakeLists.txt
Unescape View File

@ -23,8 +23,8 @@
# DEALINGS IN THE SOFTWARE.
#
if(CORRADE_TARGET_EMSCRIPTEN)
set(OBJIMPORTER_TEST_DIR "")
if(CORRADE_TARGET_EMSCRIPTEN OR CORRADE_TARGET_ANDROID)
set(OBJIMPORTER_TEST_DIR ".")
else()
set(OBJIMPORTER_TEST_DIR ${CMAKE_CURRENT_SOURCE_DIR})
endif()
@ -32,7 +32,26 @@ endif()
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/configure.h.cmake
${CMAKE_CURRENT_BINARY_DIR}/configure.h)
corrade_add_test(ObjImporterTest Test.cpp LIBRARIES MagnumObjImporterTestLib)
corrade_add_test(ObjImporterTest Test.cpp
LIBRARIES MagnumObjImporterTestLib
FILES
emptyFile.obj
keywords.obj
lineMesh.obj
missingData.obj
mixedPrimitives.obj
moreMeshes.obj
namedMesh.obj
normals.obj
optionalCoordinates.obj
pointMesh.obj
textureCoordinatesNormals.obj
textureCoordinates.obj
triangleMesh.obj
unnamedFirstMesh.obj
wrongIndexCount.obj
wrongNumberCount.obj
wrongNumbers.obj)
target_include_directories(ObjImporterTest PRIVATE ${CMAKE_CURRENT_BINARY_DIR})
# On Win32 we need to avoid dllimporting ObjImporter symbols, because it would
# search for the symbols in some DLL even though they were linked statically.
@ -41,7 +60,3 @@ target_include_directories(ObjImporterTest PRIVATE ${CMAKE_CURRENT_BINARY_DIR})
if(WIN32)
target_compile_definitions(ObjImporterTest PRIVATE "MAGNUM_OBJIMPORTER_BUILD_STATIC")
endif()
if(CORRADE_TARGET_EMSCRIPTEN)
emscripten_embed_file(ObjImporterTest "" "/")
endif()

12
src/MagnumPlugins/TgaImporter/Test/CMakeLists.txt
Unescape View File

@ -23,8 +23,8 @@
# DEALINGS IN THE SOFTWARE.
#
if(CORRADE_TARGET_EMSCRIPTEN)
set(TGAIMPORTER_TEST_DIR "")
if(CORRADE_TARGET_EMSCRIPTEN OR CORRADE_TARGET_ANDROID)
set(TGAIMPORTER_TEST_DIR ".")
else()
set(TGAIMPORTER_TEST_DIR ${CMAKE_CURRENT_SOURCE_DIR})
endif()
@ -32,7 +32,9 @@ endif()
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/configure.h.cmake
${CMAKE_CURRENT_BINARY_DIR}/configure.h)
corrade_add_test(TgaImporterTest TgaImporterTest.cpp LIBRARIES MagnumTgaImporterTestLib)
corrade_add_test(TgaImporterTest TgaImporterTest.cpp
LIBRARIES MagnumTgaImporterTestLib
FILES file.tga)
target_include_directories(TgaImporterTest PRIVATE ${CMAKE_CURRENT_BINARY_DIR})
# On Win32 we need to avoid dllimporting TgaImporter symbols, because it would
# search for the symbols in some DLL even though they were linked statically.
@ -41,7 +43,3 @@ target_include_directories(TgaImporterTest PRIVATE ${CMAKE_CURRENT_BINARY_DIR})
if(WIN32)
target_compile_definitions(TgaImporterTest PRIVATE "MAGNUM_TGAIMPORTER_BUILD_STATIC")
endif()
if(CORRADE_TARGET_EMSCRIPTEN)
emscripten_embed_file(TgaImporterTest file.tga "/file.tga")
endif()

75
src/MagnumPlugins/WavAudioImporter/Test/CMakeLists.txt
Unescape View File

@ -23,8 +23,8 @@
# DEALINGS IN THE SOFTWARE.
#
if(CORRADE_TARGET_EMSCRIPTEN)
set(WAVAUDIOIMPORTER_TEST_DIR "")
if(CORRADE_TARGET_EMSCRIPTEN OR CORRADE_TARGET_ANDROID)
set(WAVAUDIOIMPORTER_TEST_DIR ".")
else()
set(WAVAUDIOIMPORTER_TEST_DIR ${CMAKE_CURRENT_SOURCE_DIR})
endif()
@ -32,7 +32,41 @@ endif()
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/configure.h.cmake
${CMAKE_CURRENT_BINARY_DIR}/configure.h)
corrade_add_test(WavAudioImporterTest WavImporterTest.cpp LIBRARIES MagnumWavAudioImporterTestLib)
corrade_add_test(WavAudioImporterTest WavImporterTest.cpp
LIBRARIES MagnumWavAudioImporterTestLib
FILES
unsupportedChannelCount.wav
unsupportedFormat.wav
wrongSignature.wav
invalidPadding.wav
invalidLength.wav
invalidDataChunk.wav
invalidFactChunk.wav
mono4.wav
mono8.wav
mono8junk.wav
mono8ALaw.wav
mono8MuLaw.wav
mono16.wav
mono24.wav
stereo4.wav
stereo8.wav
stereo8ALaw.wav
stereo8MuLaw.wav
stereo12.wav
stereo16.wav
stereo24.wav
stereo32.wav
mono32f.wav
stereo32f.wav
stereo64f.wav
surround51Channel16.wav
surround71Channel24.wav)
target_include_directories(WavAudioImporterTest PRIVATE ${CMAKE_CURRENT_BINARY_DIR})
# On Win32 we need to avoid dllimporting WavAudioImporter symbols, because it
# would search for the symbols in some DLL even though they were linked
@ -41,38 +75,3 @@ target_include_directories(WavAudioImporterTest PRIVATE ${CMAKE_CURRENT_BINARY_D
if(WIN32)
target_compile_definitions(WavAudioImporterTest PRIVATE "MAGNUM_WAVAUDIOIMPORTER_BUILD_STATIC")
endif()
if(CORRADE_TARGET_EMSCRIPTEN)
emscripten_embed_file(WavAudioImporterTest unsupportedChannelCount.wav "/unsupportedChannelCount.wav")
emscripten_embed_file(WavAudioImporterTest unsupportedFormat.wav "/unsupportedFormat.wav")
emscripten_embed_file(WavAudioImporterTest wrongSignature.wav "/wrongSignature.wav")
emscripten_embed_file(WavAudioImporterTest invalidPadding.wav "/invalidPadding.wav")
emscripten_embed_file(WavAudioImporterTest invalidLength.wav "/invalidLength.wav")
emscripten_embed_file(WavAudioImporterTest invalidDataChunk.wav "/invalidDataChunk.wav")
emscripten_embed_file(WavAudioImporterTest invalidFactChunk.wav "/invalidFactChunk.wav")
emscripten_embed_file(WavAudioImporterTest mono4.wav "/mono4.wav")
emscripten_embed_file(WavAudioImporterTest mono8.wav "/mono8.wav")
emscripten_embed_file(WavAudioImporterTest mono8junk.wav "/mono8junk.wav")
emscripten_embed_file(WavAudioImporterTest mono8ALaw.wav "/mono8ALaw.wav")
emscripten_embed_file(WavAudioImporterTest mono8MuLaw.wav "/mono8MuLaw.wav")
emscripten_embed_file(WavAudioImporterTest mono16.wav "/mono16.wav")
emscripten_embed_file(WavAudioImporterTest mono24.wav "/mono24.wav")
emscripten_embed_file(WavAudioImporterTest stereo4.wav "/stereo4.wav")
emscripten_embed_file(WavAudioImporterTest stereo8.wav "/stereo8.wav")
emscripten_embed_file(WavAudioImporterTest stereo8ALaw.wav "/stereo8ALaw.wav")
emscripten_embed_file(WavAudioImporterTest stereo8MuLaw.wav "/stereo8MuLaw.wav")
emscripten_embed_file(WavAudioImporterTest stereo12.wav "/stereo12.wav")
emscripten_embed_file(WavAudioImporterTest stereo16.wav "/stereo16.wav")
emscripten_embed_file(WavAudioImporterTest stereo24.wav "/stereo24.wav")
emscripten_embed_file(WavAudioImporterTest stereo32.wav "/stereo32.wav")
emscripten_embed_file(WavAudioImporterTest mono32f.wav "/mono32f.wav")
emscripten_embed_file(WavAudioImporterTest stereo32f.wav "/stereo32f.wav")
emscripten_embed_file(WavAudioImporterTest stereo64f.wav "/stereo64f.wav")
emscripten_embed_file(WavAudioImporterTest surround51Channel16.wav "/surround51Channel16.wav")
emscripten_embed_file(WavAudioImporterTest surround71Channel24.wav "/surround71Channel24.wav")
endif()

Write Preview
Loading…
Cancel
Save