Modify the pc86 test harness to use 8086tiny instead of qemu. Sadly, some tests fail.

This commit is contained in:
David Given 2018-06-03 15:13:43 +02:00
parent 0eb89d5d95
commit d908f9cfb2
2 changed files with 12 additions and 4 deletions

View file

@ -51,16 +51,23 @@ definerule("plat_testsuite",
} }
} }
local methoddep = nil
local methodpath = e.method
if e.method:find("%+") then
methoddep = e.method
methodpath = "%{ins[4]}"
end
tests[#tests+1] = normalrule { tests[#tests+1] = normalrule {
name = fs, name = fs,
outleaves = { e.plat.."-"..fs.."-testlog.txt" }, outleaves = { e.plat.."-"..fs.."-testlog.txt" },
ins = { ins = {
bin, bin,
"tests/plat/testdriver.sh", "tests/plat/testdriver.sh",
"util/build+testrunner" "util/build+testrunner",
methoddep,
}, },
commands = { commands = {
"%{ins[2]} "..e.method.." %{ins[1]} 15 %{ins[3]} > %{outs}; true", "%{ins[2]} "..methodpath.." %{ins[1]} 15 %{ins[3]} > %{outs}; true",
} }
} }
end end

View file

@ -4,6 +4,8 @@ img=$2
timeout=$3 timeout=$3
timeoutprog=$4 timeoutprog=$4
set -e
errcho() { errcho() {
>&2 echo "$*" >&2 echo "$*"
} }
@ -36,8 +38,7 @@ get_test_output() {
;; ;;
*) *)
errcho "Error: $method not known by testdriver" $timeoutprog -t $timeout -- $method $img 2>&1
exit 1
;; ;;
esac esac
} }