lib/mbedtls
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2025-10-15 17:26:45 +03:00
Code Activity

Deprecate Make

Browse Source 
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>
This commit is contained in:
Ronald Cron
2025-08-29 16:12:40 +02:00
parent 401f20fb35
commit 31f63210ec
3 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
Makefile → scripts/legacy.make
View File

7
tests/scripts/depends.py
View File

@@ -439,8 +439,9 @@ class DomainData:
# pylint: disable=too-many-locals # pylint: disable=too-many-locals
def __init__(self, options, conf): def __init__(self, options, conf):
"""Gather data about the library and establish a list of domains to test.""" """Gather data about the library and establish a list of domains to test."""
build_command = [options.make_command, 'CFLAGS=-Werror -O2'] build_command = [options.make_command, '-f', 'scripts/legacy.make', 'CFLAGS=-Werror -O2']
build_and_test = [build_command, [options.make_command, 'test']] build_and_test = [build_command, [options.make_command, '-f',
'scripts/legacy.make', 'test']]
self.all_config_symbols = set(conf.settings.keys()) self.all_config_symbols = set(conf.settings.keys())
psa_info = psa_information.Information().constructors psa_info = psa_information.Information().constructors
algs = {crypto_knowledge.Algorithm(alg): symbol algs = {crypto_knowledge.Algorithm(alg): symbol
@@ -523,7 +524,7 @@ A name can either be the name of a domain or the name of one specific job."""
def run(options, job, conf, colors=NO_COLORS): def run(options, job, conf, colors=NO_COLORS):
"""Run the specified job (a Job instance).""" """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) job.announce(colors, None)
if not job.configure(conf, colors): if not job.configure(conf, colors):
job.announce(colors, False) job.announce(colors, False)

12
tests/scripts/psa_collect_statuses.py
View File

@@ -78,23 +78,25 @@ def collect_status_logs(options):
os.remove(options.log_file) os.remove(options.log_file)
if not os.path.exists(options.log_file): if not os.path.exists(options.log_file):
if options.clean_before: if options.clean_before:
subprocess.check_call(['make', 'clean'], subprocess.check_call(['make', '-f', 'scripts/legacy.make', 'clean'],
cwd='tests', cwd='tests',
stdout=sys.stderr) stdout=sys.stderr)
with open(os.devnull, 'w') as devnull: 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) stdout=devnull, stderr=devnull)
if make_q_ret != 0: 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) stdout=sys.stderr)
rebuilt = True rebuilt = True
subprocess.check_call(['make', 'test'], subprocess.check_call(['make', '-f', 'scripts/legacy.make', 'test'],
stdout=sys.stderr) stdout=sys.stderr)
data = Statuses() data = Statuses()
data.collect_log(options.log_file) data.collect_log(options.log_file)
data.get_constant_names(options.psa_constant_names) data.get_constant_names(options.psa_constant_names)
if rebuilt and options.clean_after: if rebuilt and options.clean_after:
subprocess.check_call(['make', 'clean'], subprocess.check_call(['make', '-f', 'scripts/legacy.make', 'clean'],
cwd='tests', cwd='tests',
stdout=sys.stderr) stdout=sys.stderr)
return data return data