diff options
| author | Chris Marusich <cmmarusich@gmail.com> | 2021-03-07 17:15:40 -0800 |
|---|---|---|
| committer | Chris Marusich <cmmarusich@gmail.com> | 2021-03-10 23:02:03 -0800 |
| commit | e8b83e75791c0f61273cfdf281d06aa403f8e2a9 (patch) | |
| tree | 3ea130ebf9cf5207e214156bfb5cd0a05d9787ea | |
| parent | 7b528a03331449aea147cdc4f7919e5422946f0c (diff) | |
| download | guix-e8b83e75791c0f61273cfdf281d06aa403f8e2a9.tar.gz | |
tests: guix-environment.sh: Use C_INCLUDE_PATH, not CPATH. wip-ppc64le
* 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.
| -rw-r--r-- | tests/guix-environment.sh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/guix-environment.sh b/tests/guix-environment.sh index afadcbe195..2a201ae7b2 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 |