commit 31f63210ec41a30b96d1a1d2daaf207a0a7ff65a
author Ronald Cron <ronald.cron@arm.com> Fri Aug 29 16:12:40 2025 +0200
committer Ronald Cron <ronald.cron@arm.com> Mon Sep 22 18:00:26 2025 +0200
tree 1d80401de6a328f7affc6898dd552efcd8adfb74
parent 401f20fb352a1d04edd2e9cdd48659e1d774afd1

Deprecate Make

Move and rename the root Makefile to
scripts/legacy.make. That way running
make from the root fails.

Signed-off-by: Ronald Cron <ronald.cron@arm.com>

tests/scripts/depends.py

diff --git a/tests/scripts/depends.py b/tests/scripts/depends.py
index 11ee5a0..10d7028 100755
--- a/tests/scripts/depends.py
+++ b/tests/scripts/depends.py
@@ -439,8 +439,9 @@
     # pylint: disable=too-many-locals
     def __init__(self, options, conf):
         """Gather data about the library and establish a list of domains to test."""
-        build_command = [options.make_command, 'CFLAGS=-Werror -O2']
-        build_and_test = [build_command, [options.make_command, 'test']]
+        build_command = [options.make_command, '-f', 'scripts/legacy.make', 'CFLAGS=-Werror -O2']
+        build_and_test = [build_command, [options.make_command, '-f',
+                                          'scripts/legacy.make', 'test']]
         self.all_config_symbols = set(conf.settings.keys())
         psa_info = psa_information.Information().constructors
         algs = {crypto_knowledge.Algorithm(alg): symbol
@@ -523,7 +524,7 @@
 
 def run(options, job, conf, colors=NO_COLORS):
     """Run the specified job (a Job instance)."""
-    subprocess.check_call([options.make_command, 'clean'])
+    subprocess.check_call([options.make_command, '-f', 'scripts/legacy.make', 'clean'])
     job.announce(colors, None)
     if not job.configure(conf, colors):
         job.announce(colors, False)

tests/scripts/psa_collect_statuses.py

diff --git a/tests/scripts/psa_collect_statuses.py b/tests/scripts/psa_collect_statuses.py
index d835ba7..a91e3a3 100755
--- a/tests/scripts/psa_collect_statuses.py
+++ b/tests/scripts/psa_collect_statuses.py
@@ -78,23 +78,25 @@
         os.remove(options.log_file)
     if not os.path.exists(options.log_file):
         if options.clean_before:
-            subprocess.check_call(['make', 'clean'],
+            subprocess.check_call(['make', '-f', 'scripts/legacy.make', 'clean'],
                                   cwd='tests',
                                   stdout=sys.stderr)
         with open(os.devnull, 'w') as devnull:
-            make_q_ret = subprocess.call(['make', '-q', 'lib', 'tests'],
+            make_q_ret = subprocess.call(['make', '-f', 'scripts/legacy.make',
+                                          '-q', 'lib', 'tests'],
                                          stdout=devnull, stderr=devnull)
         if make_q_ret != 0:
-            subprocess.check_call(['make', 'RECORD_PSA_STATUS_COVERAGE_LOG=1'],
+            subprocess.check_call(['make', '-f', 'scripts/legacy.make',
+                                   'RECORD_PSA_STATUS_COVERAGE_LOG=1'],
                                   stdout=sys.stderr)
             rebuilt = True
-        subprocess.check_call(['make', 'test'],
+        subprocess.check_call(['make', '-f', 'scripts/legacy.make', 'test'],
                               stdout=sys.stderr)
     data = Statuses()
     data.collect_log(options.log_file)
     data.get_constant_names(options.psa_constant_names)
     if rebuilt and options.clean_after:
-        subprocess.check_call(['make', 'clean'],
+        subprocess.check_call(['make', '-f', 'scripts/legacy.make', 'clean'],
                               cwd='tests',
                               stdout=sys.stderr)
     return data