[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
branch core-updates updated: gnu: patchelf: Fix test suite.
From: |
guix-commits |
Subject: |
branch core-updates updated: gnu: patchelf: Fix test suite. |
Date: |
Wed, 24 Jan 2024 14:54:07 -0500 |
This is an automated email from the git hooks/post-receive script.
efraim pushed a commit to branch core-updates
in repository guix.
The following commit(s) were added to refs/heads/core-updates by this push:
new 54abe5cb81 gnu: patchelf: Fix test suite.
54abe5cb81 is described below
commit 54abe5cb8163ba052de2497f4b60f89d17933225
Author: Efraim Flashner <efraim@flashner.co.il>
AuthorDate: Wed Jan 24 21:52:50 2024 +0200
gnu: patchelf: Fix test suite.
* gnu/packages/elf.scm (patchelf)[arguments]: Adjust 'fix-tests phase
for changes in the test suite.
Change-Id: Iffeb4ef94e0d78edd47d9d8b6e316f3b29627ed0
---
gnu/packages/elf.scm | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/gnu/packages/elf.scm b/gnu/packages/elf.scm
index 688aeed076..dc2db83632 100644
--- a/gnu/packages/elf.scm
+++ b/gnu/packages/elf.scm
@@ -2,7 +2,7 @@
;;; Copyright © 2013, 2014, 2015 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2014, 2015 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2015 Andreas Enge <andreas@enge.fr>
-;;; Copyright © 2017-2023 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2017-2024 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2017 Leo Famulari <leo@famulari.name>
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018, 2020 Marius Bakke <mbakke@fastmail.com>
@@ -307,8 +307,10 @@ static analysis of the ELF binaries at hand.")
(substitute* "tests/set-empty-rpath.sh"
;; Binaries with empty RPATHs cannot run on Guix, because
;; we still need to find libgcc_s (see above).
- (("^\\$\\{SCRATCH\\}\\/simple.$") ""))
- #t)))))
+ (("^\"\\$\\{SCRATCH\\}\"\\/simple.$") ""))
+ ;; Skip this test for now.
+ (substitute* "tests/Makefile.in"
+ ((".*shared-rpath\\.sh \\.*") "")))))))
(native-inputs
`(("gcc:lib" ,gcc "lib")))
(home-page "https://nixos.org/patchelf.html")
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- branch core-updates updated: gnu: patchelf: Fix test suite.,
guix-commits <=