[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
08/08: shell: Adjust test to expect C_INCLUDE_PATH, not CPATH.
From: |
guix-commits |
Subject: |
08/08: shell: Adjust test to expect C_INCLUDE_PATH, not CPATH. |
Date: |
Thu, 18 Nov 2021 17:01:45 -0500 (EST) |
civodul pushed a commit to branch core-updates-frozen
in repository guix.
commit 3ad135625b7c33f9c680943a6b79e4593c308249
Author: Ludovic Courtès <ludo@gnu.org>
AuthorDate: Thu Nov 18 22:59:40 2021 +0100
shell: Adjust test to expect C_INCLUDE_PATH, not CPATH.
This is a followup to 2a3cd4ee3557fbbdca42b5ec2f3ec4546c270203.
* tests/guix-shell.sh: Expect C_INCLUDE_PATH instead of CPATH.
---
tests/guix-shell.sh | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/tests/guix-shell.sh b/tests/guix-shell.sh
index 3bdf625..7c42fd6 100644
--- a/tests/guix-shell.sh
+++ b/tests/guix-shell.sh
@@ -83,9 +83,9 @@ then
profile=`grep "^export PATH" "$tmpdir/a" | sed -r 's|^.*="(.*)/bin"|\1|'`
# Make sure the bootstrap binaries are all listed where they belong.
- grep -E "^export PATH=\"$profile/bin\"" "$tmpdir/a"
- grep -E "^export CPATH=\"$profile/include\"" "$tmpdir/a"
- grep -E "^export LIBRARY_PATH=\"$profile/lib\"" "$tmpdir/a"
+ grep -E "^export PATH=\"$profile/bin\"" "$tmpdir/a"
+ grep -E "^export C_INCLUDE_PATH=\"$profile/include\"" "$tmpdir/a"
+ grep -E "^export LIBRARY_PATH=\"$profile/lib\"" "$tmpdir/a"
for dep in bootstrap-binaries-0 gcc-bootstrap-0 glibc-bootstrap-0
do
guix gc --references "$profile" | grep "$dep"
- branch core-updates-frozen updated (053ac37 -> 3ad1356), guix-commits, 2021/11/18
- 03/08: gnu: entangle: Build with Meson 0.59., guix-commits, 2021/11/18
- 01/08: gnu: gthumb: Build with Meson 0.59., guix-commits, 2021/11/18
- 02/08: gnu: libdmapsharing: Build against libsoup 2., guix-commits, 2021/11/18
- 04/08: gnu: gnupg@2.2.32: Hide., guix-commits, 2021/11/18
- 05/08: build-system/go: Update cross-compilation support to new interface., guix-commits, 2021/11/18
- 06/08: derivations: Officially deprecate 'build-expression->derivation'., guix-commits, 2021/11/18
- 07/08: tests: Adjust opam and pypi tests to simplified inputs., guix-commits, 2021/11/18
- 08/08: shell: Adjust test to expect C_INCLUDE_PATH, not CPATH.,
guix-commits <=