<div dir="auto">Optimization may affect the time but host speed is more likely<div dir="auto"><br></div><div dir="auto">Ok to commit</div></div><br><div class="gmail_quote"><div dir="ltr" class="gmail_attr">On Tue, Jul 5, 2022, 6:51 PM <<a href="mailto:chrisj@rtems.org">chrisj@rtems.org</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">From: Chris Johns <<a href="mailto:chrisj@rtems.org" target="_blank" rel="noreferrer">chrisj@rtems.org</a>><br>
<br>
Let the user set the test time limit in a config file to<br>
provide site specific overrides. Optimisation can effect<br>
the time a test may take to run.<br>
---<br>
tester/rtems/testing/bsps/erc32-sis.ini | 5 +-<br>
tester/rtems/testing/bsps/gr740-sis.ini | 5 +-<br>
tester/rtems/testing/bsps/griscv-sis-cov.ini | 5 +-<br>
tester/rtems/testing/bsps/griscv-sis.ini | 5 +-<br>
tester/rtems/testing/bsps/leon2-sis.ini | 5 +-<br>
tester/rtems/testing/bsps/leon3-run.ini | 3 +-<br>
tester/rtems/testing/bsps/leon3-sis-cov.ini | 5 +-<br>
tester/rtems/testing/bsps/leon3-sis.ini | 5 +-<br>
tester/rtems/testing/bsps/sis-run.ini | 5 +-<br>
tester/rtems/testing/sis.cfg | 72 ++++++++++++++++++++<br>
10 files changed, 89 insertions(+), 26 deletions(-)<br>
create mode 100644 tester/rtems/testing/sis.cfg<br>
<br>
diff --git a/tester/rtems/testing/bsps/erc32-sis.ini b/tester/rtems/testing/bsps/erc32-sis.ini<br>
index fca2122..a025265 100644<br>
--- a/tester/rtems/testing/bsps/erc32-sis.ini<br>
+++ b/tester/rtems/testing/bsps/erc32-sis.ini<br>
@@ -34,6 +34,5 @@<br>
[erc32-sis]<br>
bsp = erc32<br>
arch = sparc<br>
-tester = %{_rtscripts}/run.cfg<br>
-bsp_run_cmd = %{rtems_tools}/%{bsp_arch}-rtems%{rtems_version}-sis<br>
-bsp_run_opts = -nouartrx -r -tlim 600 s<br>
+tester = %{_rtscripts}/sis.cfg<br>
+bsp_run_opts =<br>
diff --git a/tester/rtems/testing/bsps/gr740-sis.ini b/tester/rtems/testing/bsps/gr740-sis.ini<br>
index b71048c..c42d716 100644<br>
--- a/tester/rtems/testing/bsps/gr740-sis.ini<br>
+++ b/tester/rtems/testing/bsps/gr740-sis.ini<br>
@@ -33,6 +33,5 @@<br>
[gr740-sis]<br>
bsp = gr740<br>
arch = sparc<br>
-tester = %{_rtscripts}/run.cfg<br>
-bsp_run_cmd = %{rtems_tools}/%{bsp_arch}-rtems%{rtems_version}-sis<br>
-bsp_run_opts = -gr740 -nouartrx -r -tlim 200 s -m 4<br>
+tester = %{_rtscripts}/sis.cfg<br>
+bsp_run_opts = -gr740 -m 4<br>
diff --git a/tester/rtems/testing/bsps/griscv-sis-cov.ini b/tester/rtems/testing/bsps/griscv-sis-cov.ini<br>
index 9ab37a8..fa86b55 100644<br>
--- a/tester/rtems/testing/bsps/griscv-sis-cov.ini<br>
+++ b/tester/rtems/testing/bsps/griscv-sis-cov.ini<br>
@@ -34,7 +34,6 @@<br>
[griscv-sis-cov]<br>
bsp = griscv-sis<br>
arch = riscv<br>
-tester = %{_rtscripts}/run.cfg<br>
-bsp_run_cmd = %{rtems_tools}/%{bsp_arch}-rtems%{rtems_version}-sis<br>
-bsp_run_opts = -nouartrx -r -tlim 300 s -m 4 -cov<br>
+tester = %{_rtscripts}/sis.cfg<br>
+bsp_run_opts = -m 4 -cov<br>
bsp_covoar_cmd = -S %{bsp_symbol_path} -E %{cov_explanations} -f TSIM<br>
diff --git a/tester/rtems/testing/bsps/griscv-sis.ini b/tester/rtems/testing/bsps/griscv-sis.ini<br>
index b21cba1..bf32851 100644<br>
--- a/tester/rtems/testing/bsps/griscv-sis.ini<br>
+++ b/tester/rtems/testing/bsps/griscv-sis.ini<br>
@@ -34,6 +34,5 @@<br>
[griscv-sis]<br>
bsp = griscv<br>
arch = riscv<br>
-tester = %{_rtscripts}/run.cfg<br>
-bsp_run_cmd = %{rtems_tools}/%{bsp_arch}-rtems%{rtems_version}-sis<br>
-bsp_run_opts = -nouartrx -r -tlim 300 s -m 4<br>
+tester = %{_rtscripts}/sis.cfg<br>
+bsp_run_opts = -m 4<br>
diff --git a/tester/rtems/testing/bsps/leon2-sis.ini b/tester/rtems/testing/bsps/leon2-sis.ini<br>
index 61205ad..810320c 100644<br>
--- a/tester/rtems/testing/bsps/leon2-sis.ini<br>
+++ b/tester/rtems/testing/bsps/leon2-sis.ini<br>
@@ -34,6 +34,5 @@<br>
[leon2-sis]<br>
bsp = leon2<br>
arch = sparc<br>
-tester = %{_rtscripts}/run.cfg<br>
-bsp_run_cmd = %{rtems_tools}/%{bsp_arch}-rtems%{rtems_version}-sis<br>
-bsp_run_opts = -leon2 -nouartrx -r -tlim 200 s<br>
+tester = %{_rtscripts}/sis.cfg<br>
+bsp_run_opts = -leon2<br>
diff --git a/tester/rtems/testing/bsps/leon3-run.ini b/tester/rtems/testing/bsps/leon3-run.ini<br>
index a8c97a6..99c391b 100644<br>
--- a/tester/rtems/testing/bsps/leon3-run.ini<br>
+++ b/tester/rtems/testing/bsps/leon3-run.ini<br>
@@ -34,6 +34,5 @@<br>
[leon3-run]<br>
bsp = leon3<br>
arch = sparc<br>
-tester = %{_rtscripts}/run.cfg<br>
-bsp_run_cmd = %{rtems_tools}/%{bsp_arch}-rtems%{rtems_version}-run<br>
+tester = %{_rtscripts}/sis.cfg<br>
bsp_run_opts = -a -leon3<br>
diff --git a/tester/rtems/testing/bsps/leon3-sis-cov.ini b/tester/rtems/testing/bsps/leon3-sis-cov.ini<br>
index d8ffe28..7c6a279 100644<br>
--- a/tester/rtems/testing/bsps/leon3-sis-cov.ini<br>
+++ b/tester/rtems/testing/bsps/leon3-sis-cov.ini<br>
@@ -34,7 +34,6 @@<br>
[leon3-sis-cov]<br>
bsp = leon3-sis<br>
arch = sparc<br>
-tester = %{_rtscripts}/run.cfg<br>
-bsp_run_cmd = %{rtems_tools}/%{bsp_arch}-rtems%{rtems_version}-sis<br>
-bsp_run_opts = -leon3 -nouartrx -r -tlim 200 s -cov<br>
+tester = %{_rtscripts}/sis.cfg<br>
+bsp_run_opts = -leon3 -cov<br>
bsp_covoar_cmd = -S %{bsp_symbol_path} -E %{cov_explanations} -f TSIM<br>
diff --git a/tester/rtems/testing/bsps/leon3-sis.ini b/tester/rtems/testing/bsps/leon3-sis.ini<br>
index 2f933a7..9035f48 100644<br>
--- a/tester/rtems/testing/bsps/leon3-sis.ini<br>
+++ b/tester/rtems/testing/bsps/leon3-sis.ini<br>
@@ -34,6 +34,5 @@<br>
[leon3-sis]<br>
bsp = leon3<br>
arch = sparc<br>
-tester = %{_rtscripts}/run.cfg<br>
-bsp_run_cmd = %{rtems_tools}/%{bsp_arch}-rtems%{rtems_version}-sis<br>
-bsp_run_opts = -leon3 -nouartrx -r -tlim 200 s -m 4<br>
+tester = %{_rtscripts}/sis.cfg<br>
+bsp_run_opts = -leon3 -m 4<br>
diff --git a/tester/rtems/testing/bsps/sis-run.ini b/tester/rtems/testing/bsps/sis-run.ini<br>
index 55c30ac..c34eae4 100644<br>
--- a/tester/rtems/testing/bsps/sis-run.ini<br>
+++ b/tester/rtems/testing/bsps/sis-run.ini<br>
@@ -34,6 +34,5 @@<br>
[sis-run]<br>
bsp = sis<br>
arch = sparc<br>
-tester = %{_rtscripts}/run.cfg<br>
-bsp_run_cmd = %{rtems_tools}/%{bsp_arch}-rtems%{rtems_version}-run<br>
-bsp_run_opts = -a -nouartrx<br>
+tester = %{_rtscripts}/sis.cfg<br>
+bsp_run_opts = -a<br>
diff --git a/tester/rtems/testing/sis.cfg b/tester/rtems/testing/sis.cfg<br>
new file mode 100644<br>
index 0000000..bb8d0bc<br>
--- /dev/null<br>
+++ b/tester/rtems/testing/sis.cfg<br>
@@ -0,0 +1,72 @@<br>
+#<br>
+# RTEMS Tools Project (<a href="http://www.rtems.org/" rel="noreferrer noreferrer" target="_blank">http://www.rtems.org/</a>)<br>
+# Copyright 2022 Chris Johns (<a href="mailto:chrisj@rtems.org" target="_blank" rel="noreferrer">chrisj@rtems.org</a>)<br>
+# All rights reserved.<br>
+#<br>
+# This file is part of the RTEMS Tools package in 'rtems-tools'.<br>
+#<br>
+# Redistribution and use in source and binary forms, with or without<br>
+# modification, are permitted provided that the following conditions are met:<br>
+#<br>
+# 1. Redistributions of source code must retain the above copyright notice,<br>
+# this list of conditions and the following disclaimer.<br>
+#<br>
+# 2. Redistributions in binary form must reproduce the above copyright notice,<br>
+# this list of conditions and the following disclaimer in the documentation<br>
+# and/or other materials provided with the distribution.<br>
+#<br>
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"<br>
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE<br>
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE<br>
+# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE<br>
+# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR<br>
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF<br>
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS<br>
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN<br>
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)<br>
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE<br>
+# POSSIBILITY OF SUCH DAMAGE.<br>
+#<br>
+<br>
+#<br>
+# SIS. The main simulator for SPARC/LEON<br>
+#<br>
+# Use sis command to run the executable in the spike simulator.<br>
+#<br>
+<br>
+%include %{_configdir}/base.cfg<br>
+%include %{_configdir}/checks.cfg<br>
+<br>
+#<br>
+# Console.<br>
+#<br>
+%define console_stdio<br>
+%include %{_configdir}/console.cfg<br>
+<br>
+#<br>
+# RTEMS version<br>
+#<br>
+%include %{_rtdir}/rtems/version.cfg<br>
+<br>
+#<br>
+# Timeout option. This is the default for timeout for the CPU realtime<br>
+# clock<br>
+<br>
+%ifn %{defined sis_time_limit}<br>
+ %define sis_time_limit -tlim 400 s<br>
+%endif<br>
+<br>
+#<br>
+# Default command<br>
+#<br>
+%ifn %{defined bsp_run_cmd}<br>
+ %define bsp_run_cmd %{rtems_tools}/%{bsp_arch}-rtems%{rtems_version}-sis<br>
+%endif<br>
+<br>
+%define sis_cmd %{bsp_run_cmd}<br>
+%define sis_opts -nouartrx -r %{sis_time_limit} %{bsp_run_opts}<br>
+<br>
+#<br>
+# Executable<br>
+#<br>
+%execute %{sis_cmd} %{sis_opts} %{test_executable}<br>
-- <br>
2.24.1<br>
<br>
_______________________________________________<br>
devel mailing list<br>
<a href="mailto:devel@rtems.org" target="_blank" rel="noreferrer">devel@rtems.org</a><br>
<a href="http://lists.rtems.org/mailman/listinfo/devel" rel="noreferrer noreferrer" target="_blank">http://lists.rtems.org/mailman/listinfo/devel</a><br>
</blockquote></div>