Merge branch 'master' into windows-time-fix

This commit is contained in:
Andreas Schönle 2016-12-06 17:15:37 +01:00
commit cc2bd60ecb

View File

@ -311,6 +311,7 @@ TEST(LogTest, LOGF__FATAL) {
EXPECT_TRUE(verifyContent(file_content, "FATAL"));
}
#ifndef DISABLE_FATAL_SIGNALHANDLING
TEST(LogTest, FatalSIGTERM__UsingDefaultHandler) {
RestoreFileLogger logger(log_directory);
@ -383,7 +384,7 @@ TEST(LogTest, FatalSIGTERM__UsingCustomHandler) {
}
#endif
#endif
TEST(LogTest, LOG_preFatalLogging_hook) {
{