1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-03-22 23:04:12 -07:00

Avoid calling abort() on windows when running the test suite, so that the test suite doesn't get suspended waiting for someone to press a button.

Copied from Perforce
 Change: 183041
 ServerID: perforce.ravenbrook.com
This commit is contained in:
Gareth Rees 2013-07-15 15:37:22 +01:00
parent 69fd7d4049
commit 335edef764
2 changed files with 11 additions and 1 deletions

View file

@ -61,6 +61,7 @@ mpsicv.cov:
testrun: $(AUTO_TEST_TARGETS)
!IFDEF VARIETY
set MPS_TESTLIB_NOABORT=true
..\tool\testrun.bat $(PFM) $(VARIETY) $(AUTO_TEST_TARGETS)
!ELSE
$(MAKE) /nologo /f $(PFM).nmk VARIETY=hot testrun

View file

@ -328,7 +328,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();
}
}