@@ -782,28 +782,29 @@ TEST_VM(os, iso8601_time) {
782
782
buffer[os::iso8601_timestamp_size] = ' X' ; // canary
783
783
const char * result = NULL ;
784
784
// YYYY-MM-DDThh:mm:ss.mmm+zzzz
785
- const char * const pattern = " dddd-dd-dd.dd:dd:dd.ddd+dddd" ;
785
+ const char * const pattern_utc = " dddd-dd-dd.dd:dd:dd.ddd.0000" ;
786
+ const char * const pattern_local = " dddd-dd-dd.dd:dd:dd.ddd.dddd" ;
786
787
787
788
result = os::iso8601_time (buffer, sizeof (buffer), true );
788
789
tty->print_cr (" %s" , result);
789
790
EXPECT_EQ (result, buffer);
790
- EXPECT_TRUE (very_simple_string_matcher (pattern , result));
791
+ EXPECT_TRUE (very_simple_string_matcher (pattern_utc , result));
791
792
792
793
result = os::iso8601_time (buffer, sizeof (buffer), false );
793
794
tty->print_cr (" %s" , result);
794
795
EXPECT_EQ (result, buffer);
795
- EXPECT_TRUE (very_simple_string_matcher (pattern , result));
796
+ EXPECT_TRUE (very_simple_string_matcher (pattern_local , result));
796
797
797
798
// Test with explicit timestamps
798
799
result = os::iso8601_time (0 , buffer, sizeof (buffer), true );
799
800
tty->print_cr (" %s" , result);
800
801
EXPECT_EQ (result, buffer);
801
- EXPECT_TRUE (very_simple_string_matcher (" 1970-01-01.00:00:00.000+dddd " , result));
802
+ EXPECT_TRUE (very_simple_string_matcher (" 1970-01-01.00:00:00.000+0000 " , result));
802
803
803
804
result = os::iso8601_time (17 , buffer, sizeof (buffer), true );
804
805
tty->print_cr (" %s" , result);
805
806
EXPECT_EQ (result, buffer);
806
- EXPECT_TRUE (very_simple_string_matcher (" 1970-01-01.00:00:00.017+dddd " , result));
807
+ EXPECT_TRUE (very_simple_string_matcher (" 1970-01-01.00:00:00.017+0000 " , result));
807
808
808
809
// Canary should still be intact
809
810
EXPECT_EQ (buffer[os::iso8601_timestamp_size], ' X' );
0 commit comments