Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Set separate temporary directory for zap cli, to have independent unpacks #23842

Merged
merged 4 commits into from
Dec 5, 2022
Merged

Set separate temporary directory for zap cli, to have independent unpacks #23842

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
45747ea
Set separate temporary directory for zap cli, to have independent unp…
andy31415 Nov 30, 2022
24ddeb5
Wait for regen to finish ... should be a no change now
andy31415 Nov 30, 2022
0d7f4a6
Merge branch 'master' into fix_unpack_race_in_zap
andy31415 Dec 3, 2022
0e6d730
Merge branch 'master' into fix_unpack_race_in_zap
andy31415 Dec 4, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 13 additions & 1 deletion scripts/tools/zap/generate.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
import json
import os
from pathlib import Path
import tempfile
import subprocess
import sys
import urllib.request
Expand Down Expand Up @@ -268,7 +269,18 @@ def main():
# Parallel-compatible runs will need separate state
os.environ["ZAP_TEMPSTATE"] = "1"

runGeneration(cmdLineArgs.zapFile, cmdLineArgs.zclFile, cmdLineArgs.templateFile, cmdLineArgs.outputDir)
# `zap-cli` may extract things into a temporary directory. ensure extraction
# does not conflict.
with tempfile.TemporaryDirectory(prefix='zap') as temp_dir:
old_temp = os.environ['TEMP'] if 'TEMP' in os.environ else None
os.environ['TEMP'] = temp_dir

runGeneration(cmdLineArgs.zapFile, cmdLineArgs.zclFile, cmdLineArgs.templateFile, cmdLineArgs.outputDir)

if old_temp:
os.environ['TEMP'] = old_temp
else:
del os.environ['TEMP']

prettifiers = [
runClangPrettifier,
Expand Down