From f036c4e958c6c06900930842c8b5ee9b54764acd Mon Sep 17 00:00:00 2001
From: katie <katie.may@canonical.com>
Date: Mon, 16 Dec 2024 14:27:23 +0100
Subject: [PATCH] tests: move prepare_memory_limit_override to
 prepare_each_{classic,core}

---
 tests/lib/prepare-restore.sh | 10 +++++-----
 tests/lib/prepare.sh         |  7 +++++++
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/tests/lib/prepare-restore.sh b/tests/lib/prepare-restore.sh
index e7eb6e55739..8d73bea2f81 100755
--- a/tests/lib/prepare-restore.sh
+++ b/tests/lib/prepare-restore.sh
@@ -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
diff --git a/tests/lib/prepare.sh b/tests/lib/prepare.sh
index 6e08cf4e040..142d5ada4c4 100755
--- a/tests/lib/prepare.sh
+++ b/tests/lib/prepare.sh
@@ -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() {