This is an archive of the discontinued LLVM Phabricator instance.

Differential D95641

[elfabi] Fix tests which failed on different timezones
ClosedPublic

Authored by haowei on Jan 28 2021, 2:29 PM.

Details

Reviewers
hans
gargaroff
jhenderson
Commits
rG771b35965457: [elfabi] Fix tests which failed on different timezones
Summary

This patch fixes elfabi tests on machines using a GMT+X timezone settings.
The discussion of the issue can be seen in D92902.

Diff Detail

Event Timeline

haowei requested review of this revision.Jan 28 2021, 2:29 PM
haowei created this revision.
Herald added a project: Restricted Project. · View Herald TranscriptJan 28 2021, 2:29 PM
Herald added a subscriber: llvm-commits. · View Herald Transcript
Harbormaster completed remote builds in B87073: Diff 319965.Jan 28 2021, 3:46 PM
hans added a reviewer: jhenderson.Jan 29 2021, 4:17 AM

jhenderson mentions a different solution in the discussion on D92902. Maybe that's better?

jhenderson added a subscriber: gbreynoo.Jan 29 2021, 4:33 AM

Yes, I'd recommend we use the solution that has been used elsewhere, as that is known to work (I assume, since it's been like that for a while!).

I've subscribed a colleague who has looked at these timezone issues in the past, and was involved in the llvm-ar work, so might have some further insight.

haowei updated this revision to Diff 320182.Jan 29 2021, 11:35 AM

Added env TZ=GMT to force use GMT timezone. Not quite sure if it works on Windows. The default cmd.exe does not seem to support env VAR=VAL pattern to set environment variables.

Harbormaster completed remote builds in B87196: Diff 320182.Jan 29 2021, 12:17 PM
jhenderson added a comment.Feb 1 2021, 1:09 AM
In D95641#2531117, @haowei wrote:

Added env TZ=GMT to force use GMT timezone. Not quite sure if it works on Windows. The default cmd.exe does not seem to support env VAR=VAL pattern to set environment variables.

It should work, but I'll confirm later today.

hans added a comment.Feb 1 2021, 2:10 AM
In D95641#2531117, @haowei wrote:

Not quite sure if it works on Windows. The default cmd.exe does not seem to support env VAR=VAL pattern to set environment variables.

I think the env VAR=VAL pattern is handled by lit, so it should work on Windows too.

jhenderson accepted this revision.Feb 1 2021, 2:56 AM

LGTM - the tests pass on my Windows machine (admittedly it's a GMT timezone machine, but the env part of the link doesn't cause failures at least).

This revision is now accepted and ready to land.Feb 1 2021, 2:56 AM
This revision was landed with ongoing or failed builds.Feb 1 2021, 10:59 AM
Closed by commit rG771b35965457: [elfabi] Fix tests which failed on different timezones (authored by haowei). · Explain Why
This revision was automatically updated to reflect the committed changes.
haowei added a commit: rG771b35965457: [elfabi] Fix tests which failed on different timezones.
hans added a comment.Feb 2 2021, 1:01 AM

Thanks! I've requested a merge for the LLVM 12 release in https://bugs.llvm.org/show_bug.cgi?id=48917

Revision Contents

PathSize
llvm/
test/
tools/
llvm-elfabi/
4 lines
4 lines

Diff 320529

llvm/test/tools/llvm-elfabi/preserve-dates-stub.test

## Test writing unchanged content to ELF Stub file with --write-if-changed flag. ## Test writing unchanged content to ELF Stub file with --write-if-changed flag.
# RUN: llvm-elfabi %s --output-target=elf64-little %t # RUN: llvm-elfabi %s --output-target=elf64-little %t
# RUN: touch -m -t 197001010000 %t # RUN: env TZ=GMT touch -m -t 197001010000 %t
# RUN: llvm-elfabi %s --output-target=elf64-little %t --write-if-changed # RUN: llvm-elfabi %s --output-target=elf64-little %t --write-if-changed
# RUN: ls -l %t | FileCheck %s # RUN: env TZ=GMT ls -l %t | FileCheck %s
--- !tapi-tbe --- !tapi-tbe
TbeVersion: 1.0 TbeVersion: 1.0
Arch: x86_64 Arch: x86_64
NeededLibs: NeededLibs:
- libc.so.6 - libc.so.6
Symbols: Symbols:
bar: { Type: Object, Size: 42 } bar: { Type: Object, Size: 42 }
baz: { Type: TLS, Size: 3 } baz: { Type: TLS, Size: 3 }
plus: { Type: Func } plus: { Type: Func }
... ...
# CHECK: {{[[:space:]]1970}} # CHECK: {{[[:space:]]1970}}

llvm/test/tools/llvm-elfabi/preserve-dates-tbe.test

## Test writing unchanged content to TBE file with --write-if-changed flag. ## Test writing unchanged content to TBE file with --write-if-changed flag.
# RUN: llvm-elfabi --elf %p/Inputs/gnu_hash.so --emit-tbe=%t # RUN: llvm-elfabi --elf %p/Inputs/gnu_hash.so --emit-tbe=%t
# RUN: touch -m -t 197001010000 %t # RUN: env TZ=GMT touch -m -t 197001010000 %t
# RUN: llvm-elfabi --elf %p/Inputs/gnu_hash.so --emit-tbe=%t --write-if-changed # RUN: llvm-elfabi --elf %p/Inputs/gnu_hash.so --emit-tbe=%t --write-if-changed
# RUN: ls -l %t | FileCheck %s # RUN: env TZ=GMT ls -l %t | FileCheck %s
# CHECK: {{[[:space:]]1970}} # CHECK: {{[[:space:]]1970}}