sw:vec: Fix renode test startup
Retire renode.sh and set the renode starting path at test_runner.py
Fix renode test timeout setting.
Change-Id: I21921ebd424135c035db932150f72754e941e0bc
diff --git a/cmake/vec_cc_test.cmake b/cmake/vec_cc_test.cmake
index e556810..b055f64 100644
--- a/cmake/vec_cc_test.cmake
+++ b/cmake/vec_cc_test.cmake
@@ -46,17 +46,17 @@
else()
message(WARNING "qemu-system-riscv32 doesn't exist. Make sure you build qemu first and start a clean build to enable the qemu test")
endif()
- find_program(RENODE_BIN renode.sh HINTS $ENV{OUT}/host/renode)
+ find_program(RENODE_BIN renode HINTS $ENV{OUT}/host/renode)
if(RENODE_BIN)
add_test(
NAME
"renode_${_RULE_NAME}"
COMMAND
- ${TEST_RUNNER} renode $<TARGET_FILE:${_RULE_NAME}.elf> --renode-path ${RENODE_BIN} --quick_test
+ ${TEST_RUNNER} renode $<TARGET_FILE:${_RULE_NAME}.elf> --renode-path ${RENODE_BIN} --quick_test --timeout=${_TIMEOUT}
)
set_tests_properties("renode_${_RULE_NAME}" PROPERTIES TIMEOUT ${_TIMEOUT})
else()
- message(WARNING "Renode.exe doesn't exist. Make sure you build renode first and start a clean build to enable the renode test")
+ message(WARNING "renode doesn't exist. Make sure you build renode first and start a clean build to enable the renode test")
endif()
endif(DEFINED TEST_RUNNER)
endfunction()
diff --git a/scripts/test_runner.py b/scripts/test_runner.py
index f1ca8fd..cb09d0e 100755
--- a/scripts/test_runner.py
+++ b/scripts/test_runner.py
@@ -70,6 +70,7 @@
parser.error("ROOTDIR environment variable not set.")
renode_script = """
$bin=@%(elf)s
+path set @%(rootdir)s
include @sim/config/springbok.resc"""
if args.quick_test:
renode_script += """
@@ -79,10 +80,10 @@
start
sysbus.vec_controlblock WriteDoubleWord 0xc 0"""
self.script_params = {
- "elf":elf
+ "elf": os.path.realpath(elf),
+ "rootdir": self.rootdir
}
self.renode_script = renode_script % self.script_params
-
self.renode_args = [
"%s" % path,
'--disable-xwt',
