hwpplayer1/suyu
1
0
Fork 0
forked from suyu/suyu
Code Pull requests Activity

Merge pull request #1327 from FearlessTobi/port-4171

Browse source 
Port #4171 from Citra: "Tests: Remove glad test OS X work-around"
This commit is contained in:
bunnei 2018-09-17 09:54:31 -04:00 committed by GitHub
commit e7af0f69da
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 0 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/tests/CMakeLists.txt
View file

@ -4,14 +4,12 @@ add_executable(tests
core/arm/arm_test_common.cpp core/arm/arm_test_common.cpp
core/arm/arm_test_common.h core/arm/arm_test_common.h
core/core_timing.cpp core/core_timing.cpp
glad.cpp
tests.cpp tests.cpp
) )
create_target_directory_groups(tests) create_target_directory_groups(tests)
target_link_libraries(tests PRIVATE common core) target_link_libraries(tests PRIVATE common core)
target_link_libraries(tests PRIVATE glad) # To support linker work-around
target_link_libraries(tests PRIVATE ${PLATFORM_LIBRARIES} catch-single-include Threads::Threads) target_link_libraries(tests PRIVATE ${PLATFORM_LIBRARIES} catch-single-include Threads::Threads)
add_test(NAME tests COMMAND tests) add_test(NAME tests COMMAND tests)

14
src/tests/glad.cpp
View file

@ -1,14 +0,0 @@
// Copyright 2016 Citra Emulator Project
// Licensed under GPLv2 or any later version
// Refer to the license.txt file included.
#include <catch2/catch.hpp>
#include <glad/glad.h>
// This is not an actual test, but a work-around for issue #2183.
// If tests uses functions in core but doesn't explicitly use functions in glad, the linker of macOS
// will error about undefined references from video_core to glad. So we explicitly use a glad
// function here to shut up the linker.
TEST_CASE("glad fake test", "[dummy]") {
REQUIRE(&gladLoadGL != nullptr);
}