Skip to content

Commit 0e6d88b

Browse files
authored
Merge pull request espressif#160 from brentru/sync-brentru-branch
Adds a configurable timeout for builds
2 parents 9b8ed98 + fe15057 commit 0e6d88b

File tree

1 file changed

+17
-2
lines changed

1 file changed

+17
-2
lines changed

Diff for: build_platform.py

+17-2
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,15 @@
1818
BUILD_WARN = False
1919
sys.argv.remove("--no_warn")
2020

21+
# optional timeout argument to extend build time
22+
# for larger sketches or firmware builds
23+
BUILD_TIMEOUT = False
24+
if "--build_timeout" in sys.argv:
25+
BUILD_TIMEOUT = True
26+
popen_timeout = int(sys.argv[sys.argv.index("--build_timeout") + 1])
27+
sys.argv.pop(sys.argv.index("--build_timeout") + 1)
28+
sys.argv.remove("--build_timeout")
29+
2130
# add user bin to path!
2231
BUILD_DIR = ''
2332
# add user bin to path!
@@ -375,7 +384,10 @@ def generate_uf2(example_path):
375384
cmd = ['python3', 'uf2conv.py', input_file, '-c', '-f', family_id, '-b', "0x0000", '-o', output_file]
376385

377386
proc = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
378-
r = proc.wait(timeout=60)
387+
if BUILD_TIMEOUT:
388+
r = proc.wait(timeout=popen_timeout)
389+
else:
390+
r = proc.wait(timeout=60)
379391
out = proc.stdout.read()
380392
err = proc.stderr.read()
381393
if r == 0 and not err:
@@ -461,7 +473,10 @@ def test_examples_in_folder(folderpath):
461473
proc = subprocess.Popen(cmd, stdout=subprocess.PIPE,
462474
stderr=subprocess.PIPE)
463475
try:
464-
out, err = proc.communicate(timeout=120)
476+
if BUILD_TIMEOUT:
477+
out, err = proc.communicate(timeout=popen_timeout)
478+
else:
479+
out, err = proc.communicate(timeout=120)
465480
r = proc.returncode
466481
except:
467482
proc.kill()

0 commit comments

Comments
 (0)