From 606eef43bdec016c2398d39038c34f5bff58d6b8 Mon Sep 17 00:00:00 2001 From: Todd Gamblin Date: Fri, 9 Dec 2022 02:36:54 -0800 Subject: bugfix: `spack load` shell test can fail on macos (#34419) At some point the `a` mock package became an `AutotoolsPackage`, and that means it depends on `gnuconfig` on macOS. This was causing one of our shell tests to fail on macOS because it was testing for `{a.prefix.bin}:{b.prefix.bin}` in `PATH`, but `gnuconfig` shows up between them. - [x] simplify the test to check `spack load --sh a` and `spack load --sh b` separately --- share/spack/qa/setup-env-test.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/share/spack/qa/setup-env-test.sh b/share/spack/qa/setup-env-test.sh index 03eb23a6fa..1482a87ad7 100755 --- a/share/spack/qa/setup-env-test.sh +++ b/share/spack/qa/setup-env-test.sh @@ -111,7 +111,8 @@ contains "b@" echo $LIST_CONTENT does_not_contain "a@" echo $LIST_CONTENT fails spack -m load -l # test a variable MacOS clears and one it doesn't for recursive loads -contains "export PATH=$(spack -m location -i a)/bin:$(spack -m location -i b)/bin" spack -m load --sh a +contains "export PATH=$(spack -m location -i a)/bin" spack -m load --sh a +contains "export PATH=$(spack -m location -i b)/bin" spack -m load --sh b succeeds spack -m load --only dependencies a succeeds spack -m load --only package a fails spack -m load d -- cgit v1.2.3-60-g2f50