d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update lualoader test script a little bit

Browse Source 
Use userboot.so from the test directory if possible, fall back to .OBJDIR.
This avoids a problem that we've had since userboot coexistence was added,
where userboot.so alone no longer exists in the .OBJDIR but is instead just
a link installed later.
This commit is contained in:
Kyle Evans 2018-10-25 02:04:01 +00:00
parent b5da13f72d
commit f98c671d07
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tools/boot/lua-test.sh
View File

@ -13,13 +13,16 @@ scriptdir=$(dirname $(realpath $0))
cd $(make -V SRCTOP)/stand cd $(make -V SRCTOP)/stand
obj=$(make -V .OBJDIR) obj=$(make -V .OBJDIR)
t=$obj/userboot/test/test t=$obj/userboot/test/test
u=$obj/userboot/userboot/userboot.so
[ -n "$dir" ] || dir=/tmp/loadertest [ -n "$dir" ] || dir=/tmp/loadertest
[ -d "$dir" ] || ${scriptdir}/lua-img.sh ${dir} [ -d "$dir" ] || ${scriptdir}/lua-img.sh ${dir}
# We'll try userboot.so from the test directory before plucking it straight out
# of .OBJDIR.
u=$dir/boot/userboot.so
[ -f "$u" ] || u=$obj/userboot/userboot_lua/userboot_lua.so
[ -f "$dir/boot/lua/loader.lua" ] || die "No boot/lua/loader.lua found" [ -f "$dir/boot/lua/loader.lua" ] || die "No boot/lua/loader.lua found"
[ -f "$dir/boot/kernel/kernel" ] || die "No kernel to load" [ -f "$dir/boot/kernel/kernel" ] || die "No kernel to load"
[ -x "$t" ] || die "no userboot test jig found ($t)" [ -x "$t" ] || die "no userboot test jig found ($t)"
[ -x "$u" ] || die "no userboot.so ($u) found" [ -f "$u" ] || die "no userboot.so ($u) found"
$t -h $dir -b $u $t -h $dir -b $u