Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 24 Nov 2023 22:31:50 GMT
From:      Ed Maste <emaste@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org
Subject:   git: f72b4f7e149d - main - etcupdate: temporarily comment out one tzsetup test
Message-ID:  <202311242231.3AOMVopt065017@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by emaste:

URL: https://cgit.FreeBSD.org/src/commit/?id=f72b4f7e149d82ef5b8ed7a3aa415fcd7603b350

commit f72b4f7e149d82ef5b8ed7a3aa415fcd7603b350
Author:     Ed Maste <emaste@FreeBSD.org>
AuthorDate: 2023-11-24 22:28:31 +0000
Commit:     Ed Maste <emaste@FreeBSD.org>
CommitDate: 2023-11-24 22:31:28 +0000

    etcupdate: temporarily comment out one tzsetup test
    
    This test fails after tzsetup was changed to symlink rather than copy
    the zoneinfo file (5e16809c953f).
---
 usr.sbin/etcupdate/tests/tzsetup_test.sh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/usr.sbin/etcupdate/tests/tzsetup_test.sh b/usr.sbin/etcupdate/tests/tzsetup_test.sh
index dd76884e13eb..155830bddae7 100644
--- a/usr.sbin/etcupdate/tests/tzsetup_test.sh
+++ b/usr.sbin/etcupdate/tests/tzsetup_test.sh
@@ -232,7 +232,8 @@ echo "Differences for real update:"
 diff -u -L "correct" $WORKDIR/correct.out -L "test" $WORKDIR/test.out \
     || FAILED=yes
 
-file /etc/localtime "foo"
-file /var/db/zoneinfo "foo"
+# XXX tzsetup installs a symlink as of 5e16809c953f
+#file /etc/localtime "foo"
+#file /var/db/zoneinfo "foo"
 
 [ "${FAILED}" = no ]



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202311242231.3AOMVopt065017>