Skip to content

Commit

Permalink
tests: move prepare_memory_limit_override to prepare_each_{classic,core}
Browse files Browse the repository at this point in the history
maykathm authored and ndyer committed Dec 18, 2024
1 parent 63db199 commit f036c4e
Showing 2 changed files with 12 additions and 5 deletions.
10 changes: 5 additions & 5 deletions tests/lib/prepare-restore.sh
Original file line number Diff line number Diff line change
@@ -696,15 +696,15 @@ prepare_suite_each() {
return 0
fi

# shellcheck source=tests/lib/prepare.sh
. "$TESTSLIB"/prepare.sh
# Each individual task may potentially set the SNAP_NO_MEMORY_LIMIT variable
prepare_memory_limit_override

if [[ "$variant" = full ]]; then
# shellcheck source=tests/lib/prepare.sh
. "$TESTSLIB"/prepare.sh
if os.query is-classic; then
prepare_each_classic
else
prepare_each_core
fi

fi

case "$SPREAD_SYSTEM" in
7 changes: 7 additions & 0 deletions tests/lib/prepare.sh
Original file line number Diff line number Diff line change
@@ -342,6 +342,13 @@ prepare_each_classic() {
fi

prepare_reexec_override
# Each individual task may potentially set the SNAP_NO_MEMORY_LIMIT variable
prepare_memory_limit_override
}

prepare_each_core() {
# Each individual task may potentially set the SNAP_NO_MEMORY_LIMIT variable
prepare_memory_limit_override
}

prepare_classic() {

0 comments on commit f036c4e

Please sign in to comment.