Merge pull request #10005 from keymanapp/fix/common/10004-truthful-te…

…st-epic-ldml fix(common): dx: don't call exit(0) on failure 🙀
keymanapp · Nov 15, 2023 · 6a305ca · 6a305ca
2 parents a355721 + ee39543
commit 6a305ca
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 4 deletions.
diff --git a/common/include/test_assert.h b/common/include/test_assert.h
@@ -22,7 +22,7 @@
              << console_color::reset() \
              << std::endl \
              << "  " << (exprText) << std::endl; \
-  std::exit(100*__LINE__+(result)); \
+  std::exit(EXIT_FAILURE); \
 }
 
 #ifdef try_status
@@ -55,7 +55,7 @@
              << std::endl \
              << "expected: " << (expected) << std::endl \
              << "actual:   " << (actual) << std::endl; \
-    std::exit(100*__LINE__); \
+    std::exit(EXIT_FAILURE); \
   } \
 }
 
@@ -70,6 +70,6 @@
              << std::endl \
              << "expected: " << Debug_UnicodeString((PKMX_WCHAR)(expected)) << std::endl \
              << "actual:   " << Debug_UnicodeString((PKMX_WCHAR)(actual)) << std::endl; \
-    std::exit(100*__LINE__); \
+    std::exit(EXIT_FAILURE); \
   } \
 }
diff --git a/core/build.sh b/core/build.sh
@@ -165,7 +165,7 @@ fi
 
 # -------------------------------------------------------------------------------
 
-testparams="${builder_extra_params[@]}"
+testparams="${builder_extra_params[@]} --print-errorlogs"
 if builder_has_option --test; then
   testparams="$opt_tests $testparams"
 fi

diff --git a/core/src/debuglog.cpp b/core/src/debuglog.cpp
@@ -451,6 +451,25 @@ const char *Debug_UnicodeString(::std::u16string s, int x) {
   return bufout[x];
 }
 
+const char *Debug_UnicodeString(::std::u32string s, int x) {
+  if (!ShouldDebug()) {
+    return "";
+  }
+#ifdef _MSC_VER
+  __declspec(thread)
+#endif
+  static char bufout[2][MEDIUM_BUF_SIZ];
+  auto p = s.begin();
+  char *q;
+  bufout[x][0] = 0;
+  for (q = bufout[x]; (intptr_t)(q-bufout[x]) < (128*7) && p != s.end(); p++)
+  {
+    snprintf(q, MEDIUM_BUF_SIZ - (q - bufout[x]), "U+%4.6X ", (unsigned int)*p);
+    q = strchr(q, 0);
+  }
+  return bufout[x];
+}
+
 void write_console(KMX_BOOL error, const wchar_t *fmt, ...) {
   if (!g_silent || error) {
     va_list vars;

diff --git a/core/src/debuglog.h b/core/src/debuglog.h
@@ -44,6 +44,7 @@ const char *Debug_UnicodeString(PKMX_WCHAR s, int x = 0);
  * @return pointer to temporary buffer
  */
 const char *Debug_UnicodeString(std::u16string s, int x = 0);
+const char *Debug_UnicodeString(std::u32string s, int x = 0);
 const char *Debug_ModifierName(KMX_UINT modifiers);
 
 inline KMX_BOOL ShouldDebug() {