Author: kevans
Date: Thu Nov 22 03:04:13 2018
New Revision: 340752
URL: https://svnweb.freebsd.org/changeset/base/340752
Log:
MFC r339701: Update lualoader test script a little bit
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.
Update lualo
Modified:
stable/12/tools/boot/lua-test.sh
Directory Properties:
stable/12/ (props changed)
Modified: stable/12/tools/boot/lua-test.sh
==============================================================================
--- stable/12/tools/boot/lua-test.sh Thu Nov 22 01:25:44 2018
(r340751)
+++ stable/12/tools/boot/lua-test.sh Thu Nov 22 03:04:13 2018
(r340752)
@@ -13,13 +13,16 @@ scriptdir=$(dirname $(realpath $0))
cd $(make -V SRCTOP)/stand
obj=$(make -V .OBJDIR)
t=$obj/userboot/test/test
-u=$obj/userboot/userboot/userboot.so
[ -n "$dir" ] || dir=/tmp/loadertest
[ -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/kernel/kernel" ] || die "No kernel to load"
[ -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
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
