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

Audio, GL: add tests for global state shared across libraries. 

Both currently fail on static builds.
pull/326/merge
Vladimír Vondruš 7 years ago
parent
76a73bb38d
commit
59aade762a
8 changed files with 294 additions and 0 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. 14
      src/Magnum/Audio/Test/CMakeLists.txt
  2. 53
      src/Magnum/Audio/Test/GlobalStateAcrossLibrariesALTest.cpp
  3. 37
      src/Magnum/Audio/Test/GlobalStateAcrossLibrariesLibrary.cpp
  4. 44
      src/Magnum/Audio/Test/GlobalStateAcrossLibrariesLibrary.h
  5. 14
      src/Magnum/GL/Test/CMakeLists.txt
  6. 51
      src/Magnum/GL/Test/GlobalStateAcrossLibrariesGLTest.cpp
  7. 37
      src/Magnum/GL/Test/GlobalStateAcrossLibrariesLibrary.cpp
  8. 44
      src/Magnum/GL/Test/GlobalStateAcrossLibrariesLibrary.h

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

@ -72,4 +72,18 @@ if(BUILD_AL_TESTS)
AudioPlayableALTest
PROPERTIES FOLDER "Magnum/Audio/Test")
endif()
if(MAGNUM_BUILD_STATIC AND NOT CORRADE_TARGET_EMSCRIPTEN AND NOT CORRADE_TARGET_IOS AND NOT CORRADE_TARGET_ANDROID AND NOT CORRADE_TARGET_WINDOWS_RT)
add_library(AudioGlobalStateAcrossLibrariesLibrary SHARED
GlobalStateAcrossLibrariesLibrary.cpp)
target_link_libraries(AudioGlobalStateAcrossLibrariesLibrary PUBLIC MagnumAudio)
corrade_add_test(AudioGlobalStateAcrossLibrariesALTest
GlobalStateAcrossLibrariesALTest.cpp
LIBRARIES AudioGlobalStateAcrossLibrariesLibrary)
set_target_properties(
AudioGlobalStateAcrossLibrariesLibrary
AudioGlobalStateAcrossLibrariesALTest
PROPERTIES FOLDER "Magnum/Audio/Test")
endif()
endif()

53
src/Magnum/Audio/Test/GlobalStateAcrossLibrariesALTest.cpp
Unescape View File

@ -0,0 +1,53 @@
/*
This file is part of Magnum.
Copyright © 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019
Vladimír Vondruš <mosra@centrum.cz>
Permission is hereby granted, free of charge, to any person obtaining a
copy of this software and associated documentation files (the "Software"),
to deal in the Software without restriction, including without limitation
the rights to use, copy, modify, merge, publish, distribute, sublicense,
and/or sell copies of the Software, and to permit persons to whom the
Software is furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included
in all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
DEALINGS IN THE SOFTWARE.
*/
#include <Corrade/TestSuite/Tester.h>
#include "Magnum/Audio/Context.h"
#include "GlobalStateAcrossLibrariesLibrary.h"
namespace Magnum { namespace Audio { namespace Test { namespace {
struct GlobalStateAcrossLibrariesALTest: TestSuite::Tester {
explicit GlobalStateAcrossLibrariesALTest();
void test();
};
GlobalStateAcrossLibrariesALTest::GlobalStateAcrossLibrariesALTest() {
addTests({&GlobalStateAcrossLibrariesALTest::test});
}
void GlobalStateAcrossLibrariesALTest::test() {
Context context;
CORRADE_VERIFY(Context::hasCurrent());
CORRADE_COMPARE(currentContextInALibrary(), &context);
}
}}}}
CORRADE_TEST_MAIN(Magnum::Audio::Test::GlobalStateAcrossLibrariesALTest)

37
src/Magnum/Audio/Test/GlobalStateAcrossLibrariesLibrary.cpp
Unescape View File

@ -0,0 +1,37 @@
/*
This file is part of Magnum.
Copyright © 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019
Vladimír Vondruš <mosra@centrum.cz>
Permission is hereby granted, free of charge, to any person obtaining a
copy of this software and associated documentation files (the "Software"),
to deal in the Software without restriction, including without limitation
the rights to use, copy, modify, merge, publish, distribute, sublicense,
and/or sell copies of the Software, and to permit persons to whom the
Software is furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included
in all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
DEALINGS IN THE SOFTWARE.
*/
#include "GlobalStateAcrossLibrariesLibrary.h"
#include "Magnum/Audio/Context.h"
namespace Magnum { namespace Audio { namespace Test {
Audio::Context* currentContextInALibrary() {
if(!Audio::Context::hasCurrent()) return nullptr;
return &Audio::Context::current();
}
}}}

44
src/Magnum/Audio/Test/GlobalStateAcrossLibrariesLibrary.h
Unescape View File

@ -0,0 +1,44 @@
#ifndef Magnum_Audio_Test_GlobalStateAcrossLibrariesLibrary_h
#define Magnum_Audio_Test_GlobalStateAcrossLibrariesLibrary_h
/*
This file is part of Magnum.
Copyright © 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019
Vladimír Vondruš <mosra@centrum.cz>
Permission is hereby granted, free of charge, to any person obtaining a
copy of this software and associated documentation files (the "Software"),
to deal in the Software without restriction, including without limitation
the rights to use, copy, modify, merge, publish, distribute, sublicense,
and/or sell copies of the Software, and to permit persons to whom the
Software is furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included
in all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
DEALINGS IN THE SOFTWARE.
*/
#include <Corrade/Utility/VisibilityMacros.h>
#include "Magnum/Audio/Audio.h"
#ifdef AudioGlobalStateAcrossLibrariesLibrary_EXPORTS
#define MAGNUM_GLOBALSTATEACROSSLIBRARIESLIBRARY_EXPORT CORRADE_VISIBILITY_EXPORT
#else
#define MAGNUM_GLOBALSTATEACROSSLIBRARIESLIBRARY_EXPORT CORRADE_VISIBILITY_IMPORT
#endif
namespace Magnum { namespace Audio { namespace Test {
MAGNUM_GLOBALSTATEACROSSLIBRARIESLIBRARY_EXPORT Audio::Context* currentContextInALibrary();
}}}
#endif

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

@ -208,4 +208,18 @@ if(BUILD_GL_TESTS)
corrade_add_test(GLRectangleTextureGLTest RectangleTextureGLTest.cpp LIBRARIES MagnumOpenGLTester)
set_target_properties(GLRectangleTextureGLTest PROPERTIES FOLDER "Magnum/GL/Test")
endif()
if(MAGNUM_BUILD_STATIC AND NOT CORRADE_TARGET_EMSCRIPTEN AND NOT CORRADE_TARGET_IOS AND NOT CORRADE_TARGET_ANDROID AND NOT CORRADE_TARGET_WINDOWS_RT)
add_library(GLGlobalStateAcrossLibrariesLibrary SHARED
GlobalStateAcrossLibrariesLibrary.cpp)
target_link_libraries(GLGlobalStateAcrossLibrariesLibrary PUBLIC MagnumGL)
corrade_add_test(GLGlobalStateAcrossLibrariesGLTest
GlobalStateAcrossLibrariesGLTest.cpp
LIBRARIES GLGlobalStateAcrossLibrariesLibrary MagnumOpenGLTester)
set_target_properties(
GLGlobalStateAcrossLibrariesLibrary
GLGlobalStateAcrossLibrariesGLTest
PROPERTIES FOLDER "Magnum/GL/Test")
endif()
endif()

51
src/Magnum/GL/Test/GlobalStateAcrossLibrariesGLTest.cpp
Unescape View File

@ -0,0 +1,51 @@
/*
This file is part of Magnum.
Copyright © 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019
Vladimír Vondruš <mosra@centrum.cz>
Permission is hereby granted, free of charge, to any person obtaining a
copy of this software and associated documentation files (the "Software"),
to deal in the Software without restriction, including without limitation
the rights to use, copy, modify, merge, publish, distribute, sublicense,
and/or sell copies of the Software, and to permit persons to whom the
Software is furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included
in all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
DEALINGS IN THE SOFTWARE.
*/
#include "Magnum/GL/Context.h"
#include "Magnum/GL/OpenGLTester.h"
#include "GlobalStateAcrossLibrariesLibrary.h"
namespace Magnum { namespace GL { namespace Test { namespace {
struct GlobalStateAcrossLibrariesGLTest: OpenGLTester {
explicit GlobalStateAcrossLibrariesGLTest();
void test();
};
GlobalStateAcrossLibrariesGLTest::GlobalStateAcrossLibrariesGLTest() {
addTests({&GlobalStateAcrossLibrariesGLTest::test});
}
void GlobalStateAcrossLibrariesGLTest::test() {
CORRADE_VERIFY(GL::Context::hasCurrent());
CORRADE_COMPARE(currentContextInALibrary(), &GL::Context::current());
}
}}}}
CORRADE_TEST_MAIN(Magnum::GL::Test::GlobalStateAcrossLibrariesGLTest)

37
src/Magnum/GL/Test/GlobalStateAcrossLibrariesLibrary.cpp
Unescape View File

@ -0,0 +1,37 @@
/*
This file is part of Magnum.
Copyright © 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019
Vladimír Vondruš <mosra@centrum.cz>
Permission is hereby granted, free of charge, to any person obtaining a
copy of this software and associated documentation files (the "Software"),
to deal in the Software without restriction, including without limitation
the rights to use, copy, modify, merge, publish, distribute, sublicense,
and/or sell copies of the Software, and to permit persons to whom the
Software is furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included
in all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
DEALINGS IN THE SOFTWARE.
*/
#include "GlobalStateAcrossLibrariesLibrary.h"
#include "Magnum/GL/Context.h"
namespace Magnum { namespace GL { namespace Test {
GL::Context* currentContextInALibrary() {
if(!GL::Context::hasCurrent()) return nullptr;
return &GL::Context::current();
}
}}}

44
src/Magnum/GL/Test/GlobalStateAcrossLibrariesLibrary.h
Unescape View File

@ -0,0 +1,44 @@
#ifndef Magnum_GL_Test_GlobalStateAcrossLibrariesLibrary_h
#define Magnum_GL_Test_GlobalStateAcrossLibrariesLibrary_h
/*
This file is part of Magnum.
Copyright © 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019
Vladimír Vondruš <mosra@centrum.cz>
Permission is hereby granted, free of charge, to any person obtaining a
copy of this software and associated documentation files (the "Software"),
to deal in the Software without restriction, including without limitation
the rights to use, copy, modify, merge, publish, distribute, sublicense,
and/or sell copies of the Software, and to permit persons to whom the
Software is furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included
in all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
DEALINGS IN THE SOFTWARE.
*/
#include <Corrade/Utility/VisibilityMacros.h>
#include "Magnum/GL/GL.h"
#ifdef GLGlobalStateAcrossLibrariesLibrary_EXPORTS
#define MAGNUM_GLOBALSTATEACROSSLIBRARIESLIBRARY_EXPORT CORRADE_VISIBILITY_EXPORT
#else
#define MAGNUM_GLOBALSTATEACROSSLIBRARIESLIBRARY_EXPORT CORRADE_VISIBILITY_IMPORT
#endif
namespace Magnum { namespace GL { namespace Test {
MAGNUM_GLOBALSTATEACROSSLIBRARIESLIBRARY_EXPORT GL::Context* currentContextInALibrary();
}}}
#endif
Write Preview
Loading…
Cancel
Save