diff options
| author | 2018-09-01 11:44:24 +0800 | |
|---|---|---|
| committer | 2018-09-15 15:24:11 +0200 | |
| commit | 3bd8563f2d2b3e2a8b594277dcb5ad10c65338f7 (patch) | |
| tree | cba1be8532592728b4755096d2f16052a19bafd3 /src | |
| parent | Merge pull request #1310 from lioncash/kernel-ns (diff) | |
| download | yuzu-3bd8563f2d2b3e2a8b594277dcb5ad10c65338f7.tar.gz yuzu-3bd8563f2d2b3e2a8b594277dcb5ad10c65338f7.tar.xz yuzu-3bd8563f2d2b3e2a8b594277dcb5ad10c65338f7.zip | |
Tests: Remove glad test OS X work-around
Diffstat (limited to 'src')
| -rw-r--r-- | src/tests/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/tests/glad.cpp | 14 |
2 files changed, 0 insertions, 16 deletions
diff --git a/src/tests/CMakeLists.txt b/src/tests/CMakeLists.txt index 4e75a72ec..37f09ce5f 100644 --- a/src/tests/CMakeLists.txt +++ b/src/tests/CMakeLists.txt | |||
| @@ -4,14 +4,12 @@ add_executable(tests | |||
| 4 | core/arm/arm_test_common.cpp | 4 | core/arm/arm_test_common.cpp |
| 5 | core/arm/arm_test_common.h | 5 | core/arm/arm_test_common.h |
| 6 | core/core_timing.cpp | 6 | core/core_timing.cpp |
| 7 | glad.cpp | ||
| 8 | tests.cpp | 7 | tests.cpp |
| 9 | ) | 8 | ) |
| 10 | 9 | ||
| 11 | create_target_directory_groups(tests) | 10 | create_target_directory_groups(tests) |
| 12 | 11 | ||
| 13 | target_link_libraries(tests PRIVATE common core) | 12 | target_link_libraries(tests PRIVATE common core) |
| 14 | target_link_libraries(tests PRIVATE glad) # To support linker work-around | ||
| 15 | target_link_libraries(tests PRIVATE ${PLATFORM_LIBRARIES} catch-single-include Threads::Threads) | 13 | target_link_libraries(tests PRIVATE ${PLATFORM_LIBRARIES} catch-single-include Threads::Threads) |
| 16 | 14 | ||
| 17 | add_test(NAME tests COMMAND tests) | 15 | add_test(NAME tests COMMAND tests) |
diff --git a/src/tests/glad.cpp b/src/tests/glad.cpp deleted file mode 100644 index 1797c0e3d..000000000 --- a/src/tests/glad.cpp +++ /dev/null | |||
| @@ -1,14 +0,0 @@ | |||
| 1 | // Copyright 2016 Citra Emulator Project | ||
| 2 | // Licensed under GPLv2 or any later version | ||
| 3 | // Refer to the license.txt file included. | ||
| 4 | |||
| 5 | #include <catch2/catch.hpp> | ||
| 6 | #include <glad/glad.h> | ||
| 7 | |||
| 8 | // This is not an actual test, but a work-around for issue #2183. | ||
| 9 | // If tests uses functions in core but doesn't explicitly use functions in glad, the linker of macOS | ||
| 10 | // will error about undefined references from video_core to glad. So we explicitly use a glad | ||
| 11 | // function here to shut up the linker. | ||
| 12 | TEST_CASE("glad fake test", "[dummy]") { | ||
| 13 | REQUIRE(&gladLoadGL != nullptr); | ||
| 14 | } | ||