From owner-svn-src-head@freebsd.org  Fri Feb 16 20:26:19 2018
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 0BF7AF0EF4D;
 Fri, 16 Feb 2018 20:26:19 +0000 (UTC)
 (envelope-from kevans@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id B3C2D700D5;
 Fri, 16 Feb 2018 20:26:18 +0000 (UTC)
 (envelope-from kevans@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id AE3031289A;
 Fri, 16 Feb 2018 20:26:18 +0000 (UTC)
 (envelope-from kevans@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w1GKQIHo009224;
 Fri, 16 Feb 2018 20:26:18 GMT (envelope-from kevans@FreeBSD.org)
Received: (from kevans@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id w1GKQI7k009223;
 Fri, 16 Feb 2018 20:26:18 GMT (envelope-from kevans@FreeBSD.org)
Message-Id: <201802162026.w1GKQI7k009223@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: kevans set sender to
 kevans@FreeBSD.org using -f
From: Kyle Evans <kevans@FreeBSD.org>
Date: Fri, 16 Feb 2018 20:26:18 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r329407 - head/tools/boot
X-SVN-Group: head
X-SVN-Commit-Author: kevans
X-SVN-Commit-Paths: head/tools/boot
X-SVN-Commit-Revision: 329407
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 16 Feb 2018 20:26:19 -0000

Author: kevans
Date: Fri Feb 16 20:26:18 2018
New Revision: 329407
URL: https://svnweb.freebsd.org/changeset/base/329407

Log:
  lua-test: Image the loader test directory if it doesn't exist yet

Modified:
  head/tools/boot/lua-test.sh

Modified: head/tools/boot/lua-test.sh
==============================================================================
--- head/tools/boot/lua-test.sh	Fri Feb 16 20:23:48 2018	(r329406)
+++ head/tools/boot/lua-test.sh	Fri Feb 16 20:26:18 2018	(r329407)
@@ -1,19 +1,22 @@
 #!/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" ] || die "Directory $dir doesn't exist"
+[ -d "$dir" ] || ${scriptdir}/lua-img.sh ${dir}
 [ -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)"