Skip to content

8297302: gtest/AsyncLogGtest.java fails AsyncLogTest.stdoutOutput_vm #13524

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

8297302: gtest/AsyncLogGtest.java fails AsyncLogTest.stdoutOutput_vm #13524

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 22 additions & 16 deletions test/hotspot/gtest/logging/test_asynclog.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,10 +93,8 @@ LOG_LEVEL_LIST
if (f != NULL) {
size_t sz = output.size();
size_t written = fwrite(output.c_str(), sizeof(char), output.size(), f);

if (written == sz * sizeof(char)) {
return fclose(f) == 0;
}
// at least see "header"
return fclose(f) == 0 && sz == written && sz >= 6;
}

return false;
Expand Down Expand Up @@ -257,38 +255,46 @@ TEST_VM_F(AsyncLogTest, droppingMessage) {

TEST_VM_F(AsyncLogTest, stdoutOutput) {
testing::internal::CaptureStdout();
fprintf(stdout, "header");
set_log_config("stdout", "logging=debug");

test_asynclog_ls();
test_asynclog_drop_messages();

AsyncLogWriter::flush();
EXPECT_TRUE(write_to_file(testing::internal::GetCapturedStdout()));
fflush(nullptr);

EXPECT_TRUE(file_contains_substring(TestLogFileName, "LogStreamWithAsyncLogImpl"));
EXPECT_TRUE(file_contains_substring(TestLogFileName, "logStream msg1-msg2-msg3"));
EXPECT_TRUE(file_contains_substring(TestLogFileName, "logStream newline"));
if (write_to_file(testing::internal::GetCapturedStdout())) {
EXPECT_TRUE(file_contains_substring(TestLogFileName, "header"));
EXPECT_TRUE(file_contains_substring(TestLogFileName, "LogStreamWithAsyncLogImpl"));
EXPECT_TRUE(file_contains_substring(TestLogFileName, "logStream msg1-msg2-msg3"));
EXPECT_TRUE(file_contains_substring(TestLogFileName, "logStream newline"));

if (AsyncLogWriter::instance() != nullptr) {
EXPECT_TRUE(file_contains_substring(TestLogFileName, "messages dropped due to async logging"));
if (AsyncLogWriter::instance() != nullptr) {
EXPECT_TRUE(file_contains_substring(TestLogFileName, "messages dropped due to async logging"));
}
}
}

TEST_VM_F(AsyncLogTest, stderrOutput) {
testing::internal::CaptureStderr();
fprintf(stderr, "header");
set_log_config("stderr", "logging=debug");

test_asynclog_ls();
test_asynclog_drop_messages();

AsyncLogWriter::flush();
EXPECT_TRUE(write_to_file(testing::internal::GetCapturedStderr()));
fflush(nullptr);

EXPECT_TRUE(file_contains_substring(TestLogFileName, "LogStreamWithAsyncLogImpl"));
EXPECT_TRUE(file_contains_substring(TestLogFileName, "logStream msg1-msg2-msg3"));
EXPECT_TRUE(file_contains_substring(TestLogFileName, "logStream newline"));
if (write_to_file(testing::internal::GetCapturedStderr())) {
EXPECT_TRUE(file_contains_substring(TestLogFileName, "header"));
EXPECT_TRUE(file_contains_substring(TestLogFileName, "LogStreamWithAsyncLogImpl"));
EXPECT_TRUE(file_contains_substring(TestLogFileName, "logStream msg1-msg2-msg3"));
EXPECT_TRUE(file_contains_substring(TestLogFileName, "logStream newline"));

if (AsyncLogWriter::instance() != nullptr) {
EXPECT_TRUE(file_contains_substring(TestLogFileName, "messages dropped due to async logging"));
if (AsyncLogWriter::instance() != nullptr) {
EXPECT_TRUE(file_contains_substring(TestLogFileName, "messages dropped due to async logging"));
}
}
}