From nobody Wed Oct 06 22:33:44 2021 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 14F3717E4776; Wed, 6 Oct 2021 22:33:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4HPq4872Skz3qjW; Wed, 6 Oct 2021 22:33:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id D19EF519; Wed, 6 Oct 2021 22:33:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 196MXiDG070373; Wed, 6 Oct 2021 22:33:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 196MXir1070372; Wed, 6 Oct 2021 22:33:44 GMT (envelope-from git) Date: Wed, 6 Oct 2021 22:33:44 GMT Message-Id: <202110062233.196MXir1070372@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Matthias Andree Subject: git: 4854bf20f3a1 - main - sysutils/e2fsprogs: attempt to fix SLOWTESTS build List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mandree X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4854bf20f3a1457f177baba8d8d22b86651d68c0 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mandree: URL: https://cgit.FreeBSD.org/ports/commit/?id=4854bf20f3a1457f177baba8d8d22b86651d68c0 commit 4854bf20f3a1457f177baba8d8d22b86651d68c0 Author: Matthias Andree AuthorDate: 2021-10-06 02:28:48 +0000 Commit: Matthias Andree CommitDate: 2021-10-06 05:20:55 +0000 sysutils/e2fsprogs: attempt to fix SLOWTESTS build and cherry-pick two reference data updates from upstream PR: 258124 Reported by: gja822@narod.ru --- sysutils/e2fsprogs/Makefile | 2 +- sysutils/e2fsprogs/files/patch-slowtests | 66 ++++++++++++++++++++++++++++++++ 2 files changed, 67 insertions(+), 1 deletion(-) diff --git a/sysutils/e2fsprogs/Makefile b/sysutils/e2fsprogs/Makefile index 0c6501a02da3..65d21a34dc78 100644 --- a/sysutils/e2fsprogs/Makefile +++ b/sysutils/e2fsprogs/Makefile @@ -14,7 +14,7 @@ PORTNAME= e2fsprogs PORTVERSION= 1.46.4 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES?= sysutils MASTER_SITES= KERNEL_ORG/linux/kernel/people/tytso/${PORTNAME}/v${PORTVERSION} diff --git a/sysutils/e2fsprogs/files/patch-slowtests b/sysutils/e2fsprogs/files/patch-slowtests new file mode 100644 index 000000000000..ddde26f8f343 --- /dev/null +++ b/sysutils/e2fsprogs/files/patch-slowtests @@ -0,0 +1,66 @@ +commit da33289073de254ab4bacb80b1b83cf9d27c76ea +Author: Lukas Czerner +Date: Tue Aug 24 14:10:20 2021 +0200 + + tests: update expect files for f_large_dir and f_large_dir_csum + + Update expect files for f_large_dir and f_large_dir_csum tests to + include the warning about missing y2038 support with 128-byte inodes. + + Fixes: a23b50cd ("mke2fs: warn about missing y2038 support when formatting fresh ext4 fs") + Signed-off-by: Lukas Czerner + Signed-off-by: Theodore Ts'o + +diff --git a/tests/f_large_dir/expect b/tests/f_large_dir/expect +index 028234cc..495ea85d 100644 +--- ./tests/f_large_dir/expect ++++ b/tests/f_large_dir/expect +@@ -1,3 +1,4 @@ ++128-byte inodes cannot handle dates beyond 2038 and are deprecated + Creating filesystem with 108341 1k blocks and 65072 inodes + Superblock backups stored on blocks: + 8193, 24577, 40961, 57345, 73729 +diff --git a/tests/f_large_dir_csum/expect b/tests/f_large_dir_csum/expect +index aa9f33f1..44770f7b 100644 +--- ./tests/f_large_dir_csum/expect ++++ b/tests/f_large_dir_csum/expect +@@ -1,3 +1,4 @@ ++128-byte inodes cannot handle dates beyond 2038 and are deprecated + Creating filesystem with 31002 1k blocks and 64 inodes + Superblock backups stored on blocks: + 8193, 24577 +commit 8b2beb24819a976f575e8cec04e3fe6ca8851017 +Author: Lukas Czerner +Date: Tue Aug 24 14:10:19 2021 +0200 + + tests: update expect files for f_mmp_garbage + + Update expect file for f_mmp_garbage test to work correctly with the + new default 256 inode size. + + Fixes: d730be5ceeba ("tests: update mke2fs.conf to create 256 byte inodes by default") + Signed-off-by: Lukas Czerner + Signed-off-by: Theodore Ts'o + +diff --git a/tests/f_mmp_garbage/expect.1 b/tests/f_mmp_garbage/expect.1 +index a8add101..4134eaea 100644 +--- ./tests/f_mmp_garbage/expect.1 ++++ b/tests/f_mmp_garbage/expect.1 +@@ -5,5 +5,5 @@ Pass 2: Checking directory structure + Pass 3: Checking directory connectivity + Pass 4: Checking reference counts + Pass 5: Checking group summary information +-test_filesys: 11/64 files (0.0% non-contiguous), 13/100 blocks ++test_filesys: 11/64 files (0.0% non-contiguous), 15/100 blocks + Exit status is 0 +diff --git a/tests/f_mmp_garbage/expect.2 b/tests/f_mmp_garbage/expect.2 +index 66300025..3bca182e 100644 +--- ./tests/f_mmp_garbage/expect.2 ++++ b/tests/f_mmp_garbage/expect.2 +@@ -3,5 +3,5 @@ Pass 2: Checking directory structure + Pass 3: Checking directory connectivity + Pass 4: Checking reference counts + Pass 5: Checking group summary information +-test_filesys: 11/64 files (0.0% non-contiguous), 13/100 blocks ++test_filesys: 11/64 files (0.0% non-contiguous), 15/100 blocks + Exit status is 0