diff --git a/Makefile b/scripts/legacy.make similarity index 100% rename from Makefile rename to scripts/legacy.make diff --git a/tests/scripts/depends.py b/tests/scripts/depends.py index 11ee5a0680..10d7028df0 100755 --- a/tests/scripts/depends.py +++ b/tests/scripts/depends.py @@ -439,8 +439,9 @@ class DomainData: # 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 @@ 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): """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) diff --git a/tests/scripts/psa_collect_statuses.py b/tests/scripts/psa_collect_statuses.py index d835ba7c9a..a91e3a3b30 100755 --- a/tests/scripts/psa_collect_statuses.py +++ b/tests/scripts/psa_collect_statuses.py @@ -78,23 +78,25 @@ def collect_status_logs(options): 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