Skip to content

Use native variable validation #14

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
haampie wants to merge 3 commits into
base: main
Choose a base branch
from
+9 −19
Open

Use native variable validation #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6630fae
Use native variable validation
haampie May 15, 2026
9095e8c
update test
haampie May 15, 2026
ea60e01
by->from, the
haampie May 15, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 7 additions & 17 deletions cc.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,17 +32,6 @@ unset IFS
# NOTE: Depending on your editor this may look empty, but it is not.
readonly lsep=''

# This is an array of environment variables that need to be set before
# the script runs. They are set by routines in spack.build_environment
# as part of the package installation process.
readonly params="\
SPACK_COMPILER_WRAPPER_PATH
SPACK_DEBUG_LOG_DIR
SPACK_DEBUG_LOG_ID
SPACK_SHORT_SPEC
SPACK_SYSTEM_DIRS
SPACK_MANAGED_DIRS"

# Optional parameters that aren't required to be set

# Boolean (true/false/custom) if we want to add debug flags
Expand Down Expand Up @@ -212,12 +201,13 @@ if eval "[ \"\${*#*${lsep}}\" != \"\$*\" ]"; then
die "Compiler command line contains our separator ('${lsep}'). Cannot parse."
fi

# ensure required variables are set
for param in $params; do
if eval "test -z \"\${${param}:-}\""; then
die "Spack compiler must be run from Spack! Input '$param' is missing."
fi
done
# Ensure required variables are set
: "${SPACK_COMPILER_WRAPPER_PATH:?Error: the compiler wrapper must be invoked from Spack}"
: "${SPACK_DEBUG_LOG_DIR:?Error: the compiler wrapper must be invoked from Spack}"
: "${SPACK_DEBUG_LOG_ID:?Error: the compiler wrapper must be invoked from Spack}"
: "${SPACK_SHORT_SPEC:?Error: the compiler wrapper must be invoked from Spack}"
: "${SPACK_SYSTEM_DIRS:?Error: the compiler wrapper must be invoked from Spack}"
: "${SPACK_MANAGED_DIRS:?Error: the compiler wrapper must be invoked from Spack}"

# eval this because SPACK_MANAGED_DIRS and SPACK_SYSTEM_DIRS are inputs we don't wanna loop over.
# moving the eval inside the function would eval it every call.
Expand Down
4 changes: 2 additions & 2 deletions test/run.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -358,8 +358,8 @@ test_no_wrapper_environment() {
fail "cc with no env unexpectedly exited 0"
fi
case "$_out" in
*"Spack compiler must be run from Spack"*) ;;
*) fail "expected 'Spack compiler must be run from Spack' in: $_out" ;;
*"compiler wrapper must be invoked from Spack"*) ;;
*) fail "expected 'compiler wrapper must be invoked from Spack' in: $_out" ;;
esac
}

Expand Down