@@ -20,7 +20,7 @@ target_link_libraries(tests
|
||||
PRIVATE
|
||||
trinity-core-interface
|
||||
game
|
||||
Catch2::Catch2)
|
||||
Catch2::Catch2WithMain)
|
||||
|
||||
# Link playerbot module if enabled (for Phase5 tests)
|
||||
if(BUILD_PLAYERBOT)
|
||||
|
||||
@@ -106,9 +106,9 @@ TEST_CASE("Trinity::unique_weak_ptr", "[UniqueTrackablePtr]")
|
||||
}
|
||||
|
||||
// disable warning about invalid reinterpret_cast, test intentionally tests this
|
||||
#ifdef __clang__
|
||||
#pragma GCC diagnostic push
|
||||
#pragma GCC diagnostic ignored "-Wreinterpret-base-class"
|
||||
#if TRINITY_COMPILER_IS_CLANG
|
||||
#pragma clang diagnostic push
|
||||
#pragma clang diagnostic ignored "-Wreinterpret-base-class"
|
||||
#endif
|
||||
|
||||
TEST_CASE("Trinity::unique_strong_ref_ptr type casts", "[UniqueTrackablePtr]")
|
||||
@@ -160,6 +160,6 @@ TEST_CASE("Trinity::unique_strong_ref_ptr type casts", "[UniqueTrackablePtr]")
|
||||
}
|
||||
}
|
||||
|
||||
#ifdef __clang__
|
||||
#pragma GCC diagnostic pop
|
||||
#if TRINITY_COMPILER_IS_CLANG
|
||||
#pragma clang diagnostic pop
|
||||
#endif
|
||||
|
||||
@@ -1,20 +0,0 @@
|
||||
/*
|
||||
* This file is part of the TrinityCore Project. See AUTHORS file for Copyright information
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify it
|
||||
* under the terms of the GNU General Public License as published by the
|
||||
* Free Software Foundation; either version 2 of the License, or (at your
|
||||
* option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful, but WITHOUT
|
||||
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
|
||||
* more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License along
|
||||
* with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
|
||||
#define CATCH_CONFIG_MAIN
|
||||
#include "catch2/catch.hpp"
|
||||
+1
-1
@@ -39,6 +39,6 @@ inline std::ostream& operator<<(std::ostream& os, std::nullopt_t)
|
||||
return os;
|
||||
}
|
||||
|
||||
#include "catch2/catch.hpp"
|
||||
#include <catch2/catch_all.hpp>
|
||||
|
||||
#endif
|
||||
|
||||
Reference in New Issue
Block a user