Catch-up merge from master sources to mps/branch/2013-05-17/emergency

Copied from Perforce
 Change: 182417
 ServerID: perforce.ravenbrook.com

1 files changed, 10 insertions, 0 deletions

diff --git a/mps/code/testlib.c b/mps/code/testlib.c
index b55e2876ac5..7634fcf181c 100644
--- a/mps/code/testlib.c
+++ b/mps/code/testlib.c
@@ -327,6 +327,7 @@ void verror(const char *format, va_list args)
   fflush(stdout); /* synchronize */
   vfprintf(stderr, format, args);
   fprintf(stderr, "\n");
+  fflush(stderr); /* make sure the message is output */
   exit(1);
 }
 
@@ -373,6 +374,15 @@ void cdie(int res, const char *s)
 }
 
 
+/* assert_die -- always die on assertion */
+
+void assert_die(const char *file, unsigned line, const char *condition)
+{
+  error("%s:%u: MPS ASSERTION FAILED: %s\n", file, line, condition);
+}
+
+
+
 /* C. COPYRIGHT AND LICENSE
  *
  * Copyright (c) 2001-2013 Ravenbrook Limited <http://www.ravenbrook.com/>.