1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-23 06:00:41 -08:00

Catch-up merge from master.

Copied from Perforce
 Change: 184103
 ServerID: perforce.ravenbrook.com
This commit is contained in:
Richard Brooksby 2014-01-24 14:22:27 +00:00
commit 199ef9ca11
213 changed files with 5019 additions and 3501 deletions

View file

@ -334,7 +334,16 @@ void verror(const char *format, va_list args)
vfprintf(stderr, format, args);
fprintf(stderr, "\n");
fflush(stderr); /* make sure the message is output */
abort();
/* On Windows, the abort signal pops up a dialog box. This suspends
* the test suite until a button is pressed, which is not acceptable
* for offline testing, so if the MPS_TESTLIB_NOABORT environment
* variable is set, then the test case exits instead of aborting.
*/
if (getenv("MPS_TESTLIB_NOABORT")) {
exit(EXIT_FAILURE);
} else {
abort();
}
}