Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 1 Aug 2024 15:38:20 GMT
From:      Ed Maste <emaste@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org
Subject:   git: 87f7f0389f8b - stable/14 - etcupdate: temporarily comment out one tzsetup test
Message-ID:  <202408011538.471FcKWr026934@gitrepo.freebsd.org>

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

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

commit 87f7f0389f8b7bf30ef12df5c0d337cb2789883e
Author:     Ed Maste <emaste@FreeBSD.org>
AuthorDate: 2023-11-24 22:28:31 +0000
Commit:     Ed Maste <emaste@FreeBSD.org>
CommitDate: 2024-08-01 15:11:45 +0000

    etcupdate: temporarily comment out one tzsetup test
    
    This test fails after tzsetup was changed to symlink rather than copy
    the zoneinfo file (5e16809c953f).
    
    (cherry picked from commit f72b4f7e149d82ef5b8ed7a3aa415fcd7603b350)
---
 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?202408011538.471FcKWr026934>