marusich pushed a commit to branch wip-ppc64le
in repository guix.
commit e8b83e75791c0f61273cfdf281d06aa403f8e2a9
Author: Chris Marusich <[email protected]>
AuthorDate: Sun Mar 7 17:15:40 2021 -0800
tests: guix-environment.sh: Use C_INCLUDE_PATH, not CPATH.
* tests/guix-environment.sh: In tests that verify that the search paths are
set up correctly, check C_INCLUDE_PATH instead of CPATH. This fixes a test
failure, which was likely introduced in commit
2073b55e6b964cb8ca15e8c74cb32dac00f05f0d. That commit switched gcc back to
using C_INCLUDE_PATH instead of CPATH, but it did not update this test.
---
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..2a201ae 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
