02/02: environment: Adjust to earlier 'gcc-bootstrap' search paths changes.

[guix-commits]

civodul pushed a commit to branch core-updates
in repository guix.

commit 2a3cd4ee3557fbbdca42b5ec2f3ec4546c270203
Author: Ludovic Courtès <ludo@gnu.org>
AuthorDate: Sun Jul 11 00:44:10 2021 +0200

    environment: Adjust to earlier 'gcc-bootstrap' search paths changes.
    
    This is a followup to fe6775f52b7f28a5bf74633ea4737c32a64b7e05.
    
    * tests/guix-environment.sh: Expect C_INCLUDE_PATH rather than CPATH in
    environment containing 'gcc-bootstrap'.
---
 tests/guix-environment.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/guix-environment.sh b/tests/guix-environment.sh
index afadcbe..fe2430b 100644
--- a/tests/guix-environment.sh
+++ b/tests/guix-environment.sh
@@ -192,7 +192,7 @@ then
 
     # 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 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
@@ -206,8 +206,8 @@ then
     # as returned by '--search-paths'.
     guix environment --bootstrap --no-substitutes --pure \
          -e '(@ (guix tests) gnu-make-for-tests)' \
-         -- /bin/sh -c 'echo $PATH $CPATH $LIBRARY_PATH' > "$tmpdir/b"
-    ( . "$tmpdir/a" ; echo $PATH $CPATH $LIBRARY_PATH ) > "$tmpdir/c"
+         -- /bin/sh -c 'echo $PATH $C_INCLUDE_PATH $LIBRARY_PATH' > "$tmpdir/b"
+    ( . "$tmpdir/a" ; echo $PATH $C_INCLUDE_PATH $LIBRARY_PATH ) > "$tmpdir/c"
     cmp "$tmpdir/b" "$tmpdir/c"
 
     rm "$tmpdir"/*
@@ -228,7 +228,7 @@ then
 
     # 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 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 \
                                    guile-bootstrap