stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8170936: Logging: LogFileOutput.invalid_file_test crashes when executed twice

Browse Source 
Reviewed-by: iignatyev, stuefe
This commit is contained in:
Kirill Zhaldybin 2016-12-21 11:51:57 +03:00
parent c2a96c7fca
commit 4e860e58a3
2 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
hotspot/test/native/logging/logTestUtils.inline.hpp
View File

@ -59,6 +59,20 @@ static inline void create_directory(const char* name) {
assert(!failed, "failed to create directory %s", name);
}
static inline void delete_empty_directory(const char* name) {
#ifdef _WINDOWS
if (!file_exists(name)) {
return;
}
bool failed;
failed = !RemoveDirectory(name);
EXPECT_FALSE(failed) << "failed to remove directory '" << name
<< "': LastError = " << GetLastError();
#else
delete_file(name);
#endif
}
static inline void init_log_file(const char* filename, const char* options = "") {
LogStreamHandle(Error, logging) stream;
bool success = LogConfiguration::parse_log_arguments(filename, "logging=trace", "", options, &stream);

8
hotspot/test/native/logging/test_logFileOutput.cpp
View File

@ -103,7 +103,7 @@ TEST_VM(LogFileOutput, filesize_overflow) {
EXPECT_FALSE(fo.initialize(buf, &ss)) << "Accepted filesize that overflows";
}
TEST(LogFileOutput, startup_rotation) {
TEST_VM(LogFileOutput, startup_rotation) {
const size_t rotations = 5;
const char* filename = "start-rotate-test";
char* rotated_file[rotations];
@ -140,7 +140,7 @@ TEST(LogFileOutput, startup_rotation) {
}
}
TEST(LogFileOutput, startup_truncation) {
TEST_VM(LogFileOutput, startup_truncation) {
const char* filename = "start-truncate-test";
const char* archived_filename = "start-truncate-test.0";
@ -168,7 +168,7 @@ TEST(LogFileOutput, startup_truncation) {
delete_file(archived_filename);
}
TEST(LogFileOutput, invalid_file) {
TEST_VM(LogFileOutput, invalid_file) {
ResourceMark rm;
stringStream ss;
@ -179,5 +179,5 @@ TEST(LogFileOutput, invalid_file) {
<< "file was initialized when there was an existing directory with the same name";
EXPECT_TRUE(string_contains_substring(ss.as_string(), "tmplogdir is not a regular file"))
<< "missing expected error message, received msg: %s" << ss.as_string();
remove("tmplogdir");
delete_empty_directory("tmplogdir");
}