diff options
| author | Abseil Team <absl-team@google.com> | 2017-09-25T22·35-0700 |
|---|---|---|
| committer | katzdm <katzdm@google.com> | 2017-09-25T22·36-0400 |
| commit | 2a62fbdedf64673f7c858bc6487bd15bcd2ca180 (patch) | |
| tree | f77d635ce2247cca963fcb35e8816a1787f0f7eb /absl/time/internal/test_util.cc | |
| parent | cf6ab6bb2b800fae859ccc735f398d22a7336a00 (diff) | |
Changes imported from Abseil "staging" branch:
- 76fcc6eebc6a5b5a885f04e1579762573c2bf9bc Fix broken links, and remove old README files from Git. by Daniel Katz <katzdm@google.com> - 174287df7bc7c1832fe4a66d82ee0f61a8788460 Remove "test_dependencies.bzl" file. Not needed. by Daniel Katz <katzdm@google.com> - 4e9416b389e61f5258c3a7fc0f7966f03d9ae086 Fix broken about/intro link in README.md by Abseil Team <absl-team@google.com> - 2a662ff187987246cf8f3c1de83eaa23f1d2c034 Delete extraneous comments. by Abseil Team <absl-team@google.com> - 3bdc2d15af21e0297ccf39c90c0ed51a35900679 Cleanup usage of GUNIT_DEPS_SELECTOR/GUNIT_MAIN_DEPS_SELE... by Gennadiy Rozental <rogeeff@google.com> - bec32fc8efee3ae5b67c07dcae08d74540c944d0 Enable time_test on windows: by Xiaoyi Zhang <zhangxy@google.com> GitOrigin-RevId: 76fcc6eebc6a5b5a885f04e1579762573c2bf9bc Change-Id: I9556164f6b48dae1fa02b2ec6444517faed23e1f
Diffstat (limited to 'absl/time/internal/test_util.cc')
| -rw-r--r-- | absl/time/internal/test_util.cc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/absl/time/internal/test_util.cc b/absl/time/internal/test_util.cc index 21d5f2a66393..1a415f89469e 100644 --- a/absl/time/internal/test_util.cc +++ b/absl/time/internal/test_util.cc @@ -64,8 +64,13 @@ const struct ZoneInfo { reinterpret_cast<char*>(America_Los_Angeles), America_Los_Angeles_len}, // Allows use of the local time zone from a common system-specific location. +#ifdef _MSC_VER + {"localtime", // + reinterpret_cast<char*>(America_Los_Angeles), America_Los_Angeles_len}, +#else {"/etc/localtime", // reinterpret_cast<char*>(America_Los_Angeles), America_Los_Angeles_len}, +#endif }; class TestZoneInfoSource : public cctz::ZoneInfoSource { |