AuroraMiddleware/fmt
1
0
Fork 0
mirror of https://github.com/fmtlib/fmt.git synced 2024-11-29 13:21:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Re-enable module testing

Browse Source 
Prepare for compilation with gcc (modules branch).
This commit is contained in:
Daniela Engert 2021-05-29 20:00:41 +02:00 committed by Victor Zverovich
parent ad97258915
commit 70e67ae018
3 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/fmt.cc
View File

@ -75,6 +75,11 @@ export module fmt;
#define FMT_END_DETAIL_NAMESPACE \ #define FMT_END_DETAIL_NAMESPACE \
} \ } \
export { export {
#if defined(_MSC_FULL_VER) && _MSC_FULL_VER > 192930036
#define FMT_USE_NONTYPE_TEMPLATE_PARAMETERS 0
#endif
// all library-provided declarations and definitions // all library-provided declarations and definitions
// must be in the module purview to be exported // must be in the module purview to be exported
#include "fmt/args.h" #include "fmt/args.h"
@ -86,7 +91,10 @@ export module fmt;
#include "fmt/printf.h" #include "fmt/printf.h"
#include "fmt/xchar.h" #include "fmt/xchar.h"
// gcc doesn't yet implement private module fragments
#if !FMT_GCC_VERSION
module : private; module : private;
#endif
#include "format.cc" #include "format.cc"
#include "os.cc" #include "os.cc"

4
test/CMakeLists.txt
View File

@ -94,10 +94,10 @@ if (FMT_CAN_MODULE)
$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>) $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>)
enable_module(test-module) enable_module(test-module)
#add_fmt_test(module-test MODULE) add_fmt_test(module-test MODULE)
if (MSVC) if (MSVC)
target_compile_options(test-module PRIVATE /utf-8) target_compile_options(test-module PRIVATE /utf-8)
#target_compile_options(module-test PRIVATE /utf-8) target_compile_options(module-test PRIVATE /utf-8)
endif () endif ()
endif () endif ()

14
test/module-test.cc
View File

@ -9,6 +9,12 @@
// All Rights Reserved // All Rights Reserved
// {fmt} module. // {fmt} module.
#ifdef _MSC_FULL_VER
// hide some implementation bugs in msvc
// that are not essential to users of the module.
# define FMT_HIDE_MODULE_BUGS
#endif
#include <bit> #include <bit>
#include <chrono> #include <chrono>
#include <exception> #include <exception>
@ -404,10 +410,10 @@ TEST(module_test, color) {
} }
TEST(module_test, cstring_view) { TEST(module_test, cstring_view) {
fmt::cstring_view nsv("fmt"); auto s = "fmt";
EXPECT_EQ("fmt", nsv.c_str()); EXPECT_EQ(s, fmt::cstring_view(s).c_str());
fmt::wcstring_view wsv(L"fmt"); auto w = L"fmt";
EXPECT_EQ(L"fmt", wsv.c_str()); EXPECT_EQ(w, fmt::wcstring_view(w).c_str());
} }
TEST(module_test, buffered_file) { TEST(module_test, buffered_file) {