Index: stable/12/tools/boot/lua-test.sh
===================================================================
--- stable/12/tools/boot/lua-test.sh	(revision 340751)
+++ stable/12/tools/boot/lua-test.sh	(revision 340752)
@@ -1,25 +1,28 @@
 #!/bin/sh
 # $FreeBSD$
 
 # Will image the test directory (default /tmp/loadertest) if it doesn't exist
 
 die() {
     echo $*
     exit 1
 }
 
 dir=$1
 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
Index: stable/12
===================================================================
--- stable/12	(revision 340751)
+++ stable/12	(revision 340752)

Property changes on: stable/12
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r339701