From 942077dc851175e273360d6b49eedebe19117c42 Mon Sep 17 00:00:00 2001 From: Michal Kolar Date: Fri, 5 Nov 2021 14:28:03 +0000 Subject: [PATCH] tests/tzdata-checker: modify to resolve different glibcs zdump behavior --- tests/tzdata-checker/runtest.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/tests/tzdata-checker/runtest.sh b/tests/tzdata-checker/runtest.sh index eedc833..af24c09 100755 --- a/tests/tzdata-checker/runtest.sh +++ b/tests/tzdata-checker/runtest.sh @@ -73,12 +73,13 @@ rlJournalStart rlPhaseStartSetup "Test zdump" for zone in `cat zones.int`; do - rlRun "./zdump -v -c 1970,$hiyear $zone >ref" - if uname -r | egrep -o -q '\.el5'; then # glibc's zdump is out of sync for RHEL5 + if rlIsRHEL "<8"; then # glibc's zdump is out of sync for '-v option' + rlRun "./zdump -v -c 1970,$hiyear $zone >ref" rlRun "./zdump -v -c 1970,$hiyear /usr/share/zoneinfo/$zone >cur" sed -i 's|^/usr/share/zoneinfo/||' cur else - rlRun "zdump -v -c 1970,$hiyear $zone >cur" + rlRun "./zdump -V -c 1970,$hiyear $zone >ref" + rlRun "zdump -V -c 1970,$hiyear $zone >cur" fi # normalize zdump outputs