Skip to content

Commit c414ac5

Browse files
Improvement to test automation.
github action change for adding missing pack. License now accepted automatically. Python run script detects when being run from github action.
1 parent 05e6bef commit c414ac5

File tree

2 files changed

+8
-3
lines changed

2 files changed

+8
-3
lines changed

.github/workflows/runtest.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ jobs:
6262
csolution list packs -s test_ac6.csolution.yml -m > required_packs.txt
6363
6464
cat required_packs.txt
65-
cpackget add -f required_packs.txt
65+
cpackget add -a -f required_packs.txt
6666
6767
- name: Execute
6868
run: |

Testing/cmsis_build/runall.py

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,23 @@
55
import os
66
import colorama
77
from colorama import init,Fore, Back, Style
8+
from os import environ
89

910
parser = argparse.ArgumentParser(description='Parse test description')
1011
parser.add_argument('-avh', nargs='?',type = str, default="C:/Keil_v5/ARM/VHT", help="AVH folder")
1112
parser.add_argument('-d', action='store_true', help="Debug log")
1213
parser.add_argument('-n', action='store_true', help="No force rebuild")
1314
parser.add_argument('-r', action='store_true', help="Raw results only")
1415
parser.add_argument('-c', action='store_true', help="Display cycles (so passing test are displayed)")
15-
parser.add_argument('-l', action='store_true', help="Local run (not github action)")
1616

1717
args = parser.parse_args()
1818

1919

20+
GHACTION = False
21+
22+
if "AVH_FVP_PLUGINS" in os.environ:
23+
GHACTION = True
24+
2025
DEBUG=False
2126
if args.d:
2227
DEBUG=True
@@ -332,7 +337,7 @@ def runAVH(build,core):
332337
print(res.msg,file=f)
333338
print(HTMLFOOTER,file=f)
334339

335-
if args.l:
340+
if not GHACTION:
336341
if ERROR_OCCURED:
337342
sys.exit("Error occurred")
338343
else:

0 commit comments

Comments
 (0)