aboutsummaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2021-07-11 00:44:10 +0200
committerLudovic Courtès <ludo@gnu.org>2021-07-11 00:46:54 +0200
commit2a3cd4ee3557fbbdca42b5ec2f3ec4546c270203 (patch)
treeb47ed532f8ae808053601925fc5bd89d5e1af793 /tests
parent152b167cfac863885e00a5e94d0f1a687d165923 (diff)
downloadguix-2a3cd4ee3557fbbdca42b5ec2f3ec4546c270203.tar
guix-2a3cd4ee3557fbbdca42b5ec2f3ec4546c270203.tar.gz
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'.
Diffstat (limited to 'tests')
-rw-r--r--tests/guix-environment.sh8
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/guix-environment.sh b/tests/guix-environment.sh
index afadcbe195..fe2430b658 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