From 00235d8a99fe0bbbbb76ca2de4e690a9e73e8f30 Mon Sep 17 00:00:00 2001
From: Cameron DaCamara <cadacama@microsoft.com>
Date: Sat, 17 Jul 2021 09:16:49 -0700
Subject: [PATCH] fix module test odr violations (#2414)

---
 test/gtest-extra.h  | 5 +++++
 test/module-test.cc | 2 ++
 test/util.h         | 4 ++++
 3 files changed, 11 insertions(+)

diff --git a/test/gtest-extra.h b/test/gtest-extra.h
index 49844f9e5a1a..3a3a96cf7f62 100644
--- a/test/gtest-extra.h
+++ b/test/gtest-extra.h
@@ -12,7 +12,12 @@
 
 #include <string>
 
+#ifdef FMT_MODULE_TEST
+import fmt;
+#else
 #include "fmt/os.h"
+#endif // FMG_MODULE_TEST
+
 #include "gmock/gmock.h"
 
 #define FMT_TEST_THROW_(statement, expected_exception, expected_message, fail) \
diff --git a/test/module-test.cc b/test/module-test.cc
index 5d050406846a..7b09ddce7ee7 100644
--- a/test/module-test.cc
+++ b/test/module-test.cc
@@ -15,6 +15,8 @@
 #  define FMT_HIDE_MODULE_BUGS
 #endif
 
+#define FMT_MODULE_TEST
+
 #include <bit>
 #include <chrono>
 #include <exception>
diff --git a/test/util.h b/test/util.h
index e7824b7d0993..97e509090739 100644
--- a/test/util.h
+++ b/test/util.h
@@ -10,7 +10,11 @@
 #include <locale>
 #include <string>
 
+#ifdef FMT_MODULE_TEST
+import fmt;
+#else
 #include "fmt/os.h"
+#endif // FMT_MODULE_TEST
 
 #ifdef _MSC_VER
 #  define FMT_VSNPRINTF vsprintf_s