Переглянути джерело

Merge pull request #40730 from RevoluPowered/msvc_fix_crash_debugging_tests

Fixes msvc debugging tests crashing
Rémi Verschelde 5 роки тому
батько
коміт
326c303fc6
1 змінених файлів з 7 додано та 0 видалено
  1. 7 0
      tests/SCsub

+ 7 - 0
tests/SCsub

@@ -9,6 +9,13 @@ env_tests = env.Clone()
 # Enable test framework and inform it of configuration method.
 env_tests.Append(CPPDEFINES=["DOCTEST_CONFIG_IMPLEMENT"])
 
+# We must disable the THREAD_LOCAL entirely in doctest to prevent crashes on debugging
+# Since we link with /MT thread_local is always expired when the header is used
+# So the debugger crashes the engine and it causes weird errors
+# Explained in https://github.com/onqtam/doctest/issues/401
+if env_tests["platform"] == "windows":
+    env_tests.Append(CPPDEFINES=[("DOCTEST_THREAD_LOCAL", "")])
+
 env_tests.add_source_files(env.tests_sources, "*.cpp")
 
 lib = env_tests.add_library("tests", env.tests_sources)