From cb7c32bb672d17bdf6e08f156ad612cbb428f025 Mon Sep 17 00:00:00 2001 From: Reepca Russelstein Date: Sun, 28 Jun 2026 23:06:11 -0500 Subject: tests: style: conditionally disable two tests. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The length of the repository url causes it to go on its own line in 'guix build guix' but not in 'make check' from a regular checkout with a shorter TMPDIR. Skip the tests in the case where they are currently known to fail, until a proper fix can be implemented so that this doesn't block security fixes from being deployed. * tests/style.scm (%temporary-repository-file-name-too-long?): new variable. ("url-fetch->git-fetch, basic transformation", "url-fetch->git-fetch, preserved field" test cases): conditionally skip. Fixes: guix/guix#6946 Change-Id: I4c14a89dac042a556b829398d12242b67cf579cd Signed-off-by: Ludovic Courtès Merges: #9623 --- tests/style.scm | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'tests') diff --git a/tests/style.scm b/tests/style.scm index 60b99638dd6..5168ab03fc7 100644 --- a/tests/style.scm +++ b/tests/style.scm @@ -544,6 +544,16 @@ ;;; url-fetch->git-fetch transformation ;;; +(define %temporary-repository-file-name-too-long? + ;; Whether the file name of the repository created by + ;; 'with-temporary-git-repository' would be "too long." If it is too long + ;; --e.g, + ;; file:///tmp/guix-build-guix-1.5.0-3.17ec386.drv-0/guix-directory.lhhGOq--, + ;; the indentation rules differ, which would cause test failures below. + (> (string-length (or (getenv "TMPDIR") "/tmp")) 30)) + +(when %temporary-repository-file-name-too-long? + (test-skip 1)) (test-equal "url-fetch->git-fetch, basic transformation" `((origin (method git-fetch) @@ -587,6 +597,8 @@ (read-package-field (@ (my-packages-0) my-coreutils-0) 'source 8))))) "0")) +(when %temporary-repository-file-name-too-long? + (test-skip 1)) (test-equal "url-fetch->git-fetch, preserved field" `((origin (method git-fetch) -- cgit v1.2.3