Skip to content

Commit ea37fda

Browse files
committed
Revert "Ensure sync after clean and after updating config"
This reverts commit 7ddc4ca.
1 parent d8d470d commit ea37fda

File tree

1 file changed

+0
-13
lines changed

1 file changed

+0
-13
lines changed

tools/bin/mtest

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -141,16 +141,9 @@ def subrun(cmd, test_dir=False, silent=False, ignore_failure=False, color=False)
141141
return (output, r.returncode)
142142

143143

144-
def sync():
145-
# Ensure that e.g. config updates are sync'd before running make - have occasionally observed errors
146-
# that might have come from make not seeing the changes to the config that have just been written.
147-
subrun(["sync", ROOT], silent=True)
148-
149-
150144
def clean():
151145
log("make clean")
152146
subrun(["make", "clean"], silent=True)
153-
sync()
154147

155148

156149
def toolchain_exes(target):
@@ -585,8 +578,6 @@ def configure_options(target):
585578
backup_config_options(crypto_config_file)
586579
log(f"cp {new_crypto_config} {crypto_config_file}")
587580
shutil.copy(new_crypto_config, crypto_config_file)
588-
589-
sync()
590581

591582
# apply bulk config.py settings to main config file
592583
for config in config_py_groups:
@@ -618,8 +609,6 @@ def configure_options(target):
618609
if crypto_config_file is None:
619610
crypto_config_file = get_crypto_config_file()
620611
set_config_option(action, config, crypto_config_file, silent=False)
621-
622-
sync()
623612

624613

625614
def flags_to_hr_str(flags):
@@ -720,8 +709,6 @@ def build(target, tests):
720709
log(f"{make_log} -C {TEST_DIR} {' '.join(tests)} {flags_to_hr_str(flags)}")
721710
subrun(make_cmd + tests + flags, test_dir=True, silent=True, color=True)
722711

723-
sync()
724-
725712
if args.tests:
726713
log(subrun(["file", tests[0]], test_dir=True, silent=True)[0].strip())
727714
log("ok")

0 commit comments

Comments
 (0)