lava_create_jobs.py: PSA API "FF" tests require different console
The test output happens on second terminal, to be accessed via telnet.
Signed-off-by: Paul Sokolovsky <paul.sokolovsky@linaro.org>
Change-Id: I659d8ae991e41847a61cf2fd105064a808b48b60
diff --git a/lava_helper/jinja2_templates/fvp_mps2.jinja2 b/lava_helper/jinja2_templates/fvp_mps2.jinja2
index a235a26..40c0b31 100644
--- a/lava_helper/jinja2_templates/fvp_mps2.jinja2
+++ b/lava_helper/jinja2_templates/fvp_mps2.jinja2
@@ -40,9 +40,14 @@
image: /opt/model/FVP_MPS2_AEMv8M/models/Linux64_GCC-6.4/FVP_MPS2_AEMv8M
timeout:
minutes: 5
+{%- if psa_api_suite == "FF" %}
+ console_string: 'telnetterminal2: Listening for serial connection on port (?P<PORT>\d+)'
+ use_telnet: True
+{%- else %}
console_string: 'telnetterminal0: Listening for serial connection on port (?P<PORT>\d+)'
- license_variable: '{{ license_variable }}'
use_telnet: False
+{%- endif %}
+ license_variable: '{{ license_variable }}'
arguments:
- "--application cpu0={APP}"
- "--data cpu0={DATA}@{{ data_bin_offset }}"
diff --git a/lava_helper/lava_create_jobs.py b/lava_helper/lava_create_jobs.py
index ebcfc4d..6c29f4d 100755
--- a/lava_helper/lava_create_jobs.py
+++ b/lava_helper/lava_create_jobs.py
@@ -135,7 +135,8 @@
"coverage_trace_plugin": coverage_trace_plugin,
"build_job_url": artifact_store_url,
"cpu0_baseline": config.get("cpu0_baseline", 0),
- "cpu0_initvtor_s": config.get("cpu0_initvtor_s", "0x10000000")
+ "cpu0_initvtor_s": config.get("cpu0_initvtor_s", "0x10000000"),
+ "psa_api_suite": user_args.psa_suite,
}
for binary_type, binary_name in config["binaries"].items():
params.update(