twister: do not use non-existing architectures
Do not use non-existing architectures, we now have an enum in the
schema.
Signed-off-by: Anas Nashif <anas.nashif@intel.com>
diff --git a/scripts/tests/twister/test_data/boards/1_level/2_level/board_config_1.yaml b/scripts/tests/twister/test_data/boards/1_level/2_level/board_config_1.yaml
index 248e068..b801812 100644
--- a/scripts/tests/twister/test_data/boards/1_level/2_level/board_config_1.yaml
+++ b/scripts/tests/twister/test_data/boards/1_level/2_level/board_config_1.yaml
@@ -1,7 +1,7 @@
identifier: demo_board_1
name: DEMO_Board_1
type: mcu
-arch: arm_demo
+arch: arm
toolchain:
- zephyr
- gnuarmemb
diff --git a/scripts/tests/twister/test_data/boards/1_level/2_level/board_config_2.yaml b/scripts/tests/twister/test_data/boards/1_level/2_level/board_config_2.yaml
index 4da98f3..7336ba1c 100644
--- a/scripts/tests/twister/test_data/boards/1_level/2_level/board_config_2.yaml
+++ b/scripts/tests/twister/test_data/boards/1_level/2_level/board_config_2.yaml
@@ -1,7 +1,7 @@
identifier: demo_board_2
name: DEMO_Board_2
type: mcu
-arch: x86_demo
+arch: x86
toolchain:
- zephyr
- gnuarmemb
diff --git a/scripts/tests/twister/test_data/boards/1_level/2_level/board_config_3.yaml b/scripts/tests/twister/test_data/boards/1_level/2_level/board_config_3.yaml
index a80ccb1..5711872 100644
--- a/scripts/tests/twister/test_data/boards/1_level/2_level/board_config_3.yaml
+++ b/scripts/tests/twister/test_data/boards/1_level/2_level/board_config_3.yaml
@@ -1,7 +1,7 @@
identifier: demo_board_3
name: DEMO_Board_3
type: mcu
-arch: arm_demo
+arch: arm
toolchain:
- zephyr
- gnuarmemb
diff --git a/scripts/tests/twister/test_platform.py b/scripts/tests/twister/test_platform.py
index b3a1723..4da0bb4 100644
--- a/scripts/tests/twister/test_platform.py
+++ b/scripts/tests/twister/test_platform.py
@@ -21,11 +21,11 @@
(
"""\
identifier: dummy empty
-arch: arch0
+arch: arc
""",
{
'name': 'dummy empty',
- 'arch': 'arch0',
+ 'arch': 'arc',
'twister': True,
'ram': 128,
'timeout_multiplier': 1.0,
@@ -44,7 +44,7 @@
'env': [],
'env_satisfied': True
},
- '<dummy empty on arch0>'
+ '<dummy empty on arc>'
),
(
"""\
diff --git a/scripts/tests/twister/test_testinstance.py b/scripts/tests/twister/test_testinstance.py
index bf3b1ff..1b1c99a 100644
--- a/scripts/tests/twister/test_testinstance.py
+++ b/scripts/tests/twister/test_testinstance.py
@@ -99,9 +99,9 @@
(False, False, False, ["demo_board_2"], 'native',
["CONFIG_LOG=y"], 'CONFIG_LOG=y'),
(False, False, False, ["demo_board_2"], 'native',
- ["arch:x86_demo:CONFIG_LOG=y"], 'CONFIG_LOG=y'),
+ ["arch:x86:CONFIG_LOG=y"], 'CONFIG_LOG=y'),
(False, False, False, ["demo_board_2"], 'native',
- ["arch:arm_demo:CONFIG_LOG=y"], ''),
+ ["arch:arm:CONFIG_LOG=y"], ''),
(False, False, False, ["demo_board_2"], 'native',
["platform:demo_board_2:CONFIG_LOG=y"], 'CONFIG_LOG=y'),
(False, False, False, ["demo_board_2"], 'native',
diff --git a/scripts/tests/twister/test_testplan.py b/scripts/tests/twister/test_testplan.py
index 1f765c4..02eae84 100644
--- a/scripts/tests/twister/test_testplan.py
+++ b/scripts/tests/twister/test_testplan.py
@@ -101,7 +101,7 @@
("platform_allow", ['demo_board_1'], None, None, "Not in testsuite platform allow list"),
("toolchain_exclude", ['zephyr'], None, None, "In test case toolchain exclude"),
("platform_exclude", ['demo_board_2'], None, None, "In test case platform exclude"),
- ("arch_exclude", ['x86_demo'], None, None, "In test case arch exclude"),
+ ("arch_exclude", ['x86'], None, None, "In test case arch exclude"),
("arch_allow", ['arm'], None, None, "Not in test case arch allow list"),
("skip", True, None, None, "Skip filter"),
("tags", set(['sensor', 'bluetooth']), "ignore_tags", ['bluetooth'], "Excluded tags per platform (exclude_tags)"),
@@ -1088,7 +1088,7 @@
):
# tmp_path
# └ boards <- board root
- # ├ arch1
+ # ├ x86
# │ ├ p1
# │ | ├ p1e1.yaml
# │ | └ p1e2.yaml
@@ -1096,7 +1096,7 @@
# │ ├ p2.yaml
# │ └ p2-1.yaml <- duplicate
# │ └ p2-2.yaml <- load error
- # └ arch2
+ # └ arm
# └ p3
# ├ p3.yaml
# └ p3_B.conf
@@ -1104,7 +1104,7 @@
tmp_board_root_dir = tmp_path / 'boards'
tmp_board_root_dir.mkdir()
- tmp_arch1_dir = tmp_board_root_dir / 'arch1'
+ tmp_arch1_dir = tmp_board_root_dir / 'x86'
tmp_arch1_dir.mkdir()
tmp_p1_dir = tmp_arch1_dir / 'p1'
@@ -1129,7 +1129,7 @@
identifier: p1e1
name: Platform 1 Edition 1
type: native
-arch: arch1
+arch: x86
vendor: vendor1
toolchain:
- zephyr
@@ -1142,7 +1142,7 @@
identifier: p1e2
name: Platform 1 Edition 2
type: native
-arch: arch1
+arch: x86
vendor: vendor1
toolchain:
- zephyr
@@ -1172,7 +1172,7 @@
identifier: p2
name: Platform 2
type: sim
-arch: arch1
+arch: x86
vendor: vendor2
toolchain:
- zephyr
@@ -1192,7 +1192,7 @@
identifier: p2_2
name: Platform 2 2
type: sim
-arch: arch1
+arch: x86
vendor: vendor2
toolchain:
- zephyr
@@ -1200,7 +1200,7 @@
p2_2_yamlfile = tmp_p2_dir / 'p2-2.yaml'
p2_2_yamlfile.write_text(p2_2_yaml)
- tmp_arch2_dir = tmp_board_root_dir / 'arch2'
+ tmp_arch2_dir = tmp_board_root_dir / 'arm'
tmp_arch2_dir.mkdir()
tmp_p3_dir = tmp_arch2_dir / 'p3'
@@ -1221,7 +1221,7 @@
identifier: p3
name: Platform 3
type: unit
-arch: arch2
+arch: arm
vendor: vendor3
toolchain:
- zephyr
