Merge pull request #171 from espressif/fix/negative_int_for_soc_header

fix: negative value for soc caps integer
espressif · Dec 20, 2024 · ac74ba1 · ac74ba1 · github-actions · Dec 20, 2024
2 parents e2ee173 + 494be97
commit ac74ba1
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 1 deletion.
diff --git a/idf_build_apps/manifest/soc_header.py b/idf_build_apps/manifest/soc_header.py
@@ -42,7 +42,7 @@
 # Define value, either a hex, int or a string
 _hex_value = Combine(Literal('0x') + Word(hexnums) + Optional(_literal_suffix).suppress())('hex_value')
 _str_value = QuotedString('"')('str_value')
-_int_value = Word(nums)('int_value') + ~Char('.') + Optional(_literal_suffix)('literal_suffix')
+_int_value = Combine(Optional('-') + Word(nums))('int_value') + ~Char('.') + Optional(_literal_suffix)('literal_suffix')
 
 # Remove optional parenthesis around values
 _value = Optional('(').suppress() + MatchFirst([_hex_value, _str_value, _int_value])('value') + Optional(')').suppress()

diff --git a/tests/test_soc_caps.py b/tests/test_soc_caps.py
@@ -0,0 +1,21 @@
+# SPDX-FileCopyrightText: 2024 Espressif Systems (Shanghai) CO LTD
+# SPDX-License-Identifier: Apache-2.0
+
+import pytest
+
+from idf_build_apps.manifest.soc_header import parse_define
+
+
+@pytest.mark.parametrize(
+    's, res',
+    [
+        ('#define SOC_FOO        (4)', '4'),
+        ('#define SOC_FOO        (-4)', '-4'),
+        ('#define SOC_FOO       4', '4'),
+        ('#define SOC_FOO     -4', '-4'),
+    ],
+)
+def test_parse_define_int(s, res):
+    parse_result = parse_define(s)
+    assert parse_result['name'] == 'SOC_FOO'
+    assert parse_result['int_value'] == res
File	Stmts	Miss	Cover	Missing
idf_build_apps
__main__.py	3	3	0%	4–9
app.py	523	81	85%	206, 251, 260–262, 294, 306, 323, 364–365, 368, 378–379, 390–393, 453–458, 478, 516, 572–580, 590–591, 601, 619–620, 622, 638–647, 663–701, 706–707, 711–712, 723–725, 731, 832–840, 850–880, 884–894, 985–991, 994, 1016
args.py	291	33	89%	154, 310, 323, 330, 351–356, 366–371, 537, 540–541, 547, 557–559, 562, 587–588, 591–592, 721–722, 783, 785, 845, 864–874
autocompletions.py	29	24	17%	16–23, 31–54
constants.py	63	9	86%	20–21, 33–38, 47–48, 61–62
finder.py	84	6	93%	79–80, 150, 167–169
log.py	48	4	92%	37, 50, 55, 80
main.py	199	61	69%	76–80, 94–99, 140–144, 174, 198–200, 204, 209–222, 237–240, 251–276, 366–373, 382–383, 405–413, 416, 422–423, 429–431
session_args.py	54	7	87%	46–50, 56, 70
utils.py	188	23	88%	26, 35, 113, 130–131, 151–155, 203, 246, 273–279, 292–295, 314–315, 380
idf_build_apps/junit
report.py	93	9	90%	82, 92, 109–111, 137, 144–145, 170
utils.py	29	10	66%	18, 26–35
idf_build_apps/manifest
if_parser.py	109	5	95%	62, 99, 105, 169, 174
manifest.py	219	9	96%	90, 92, 139, 161, 306, 337–338, 357, 401
idf_build_apps/vendors
pydantic_sources.py	64	6	91%	50, 73, 76–79, 96
TOTAL	2123	290	86%