From owner-svn-src-user@FreeBSD.ORG  Sun Sep 14 02:28:04 2014
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 7864355F;
 Sun, 14 Sep 2014 02:28:04 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 63F827E5;
 Sun, 14 Sep 2014 02:28:04 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s8E2S4j8002890;
 Sun, 14 Sep 2014 02:28:04 GMT (envelope-from jmmv@FreeBSD.org)
Received: (from jmmv@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s8E2S4Ot002889;
 Sun, 14 Sep 2014 02:28:04 GMT (envelope-from jmmv@FreeBSD.org)
Message-Id: <201409140228.s8E2S4Ot002889@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: jmmv set sender to jmmv@FreeBSD.org
 using -f
From: Julio Merino <jmmv@FreeBSD.org>
Date: Sun, 14 Sep 2014 02:28:04 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r271564 - user/jmmv/autotest/node
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
 src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user/>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 14 Sep 2014 02:28:04 -0000

Author: jmmv
Date: Sun Sep 14 02:28:03 2014
New Revision: 271564
URL: http://svnweb.freebsd.org/changeset/base/271564

Log:
  Cope with kyua-0.10
  
  Explicitly tell "kyua test" where to store the results database and copy
  the generated file out of the VM.

Modified:
  user/jmmv/autotest/node/iterate.sh

Modified: user/jmmv/autotest/node/iterate.sh
==============================================================================
--- user/jmmv/autotest/node/iterate.sh	Sun Sep 14 01:57:22 2014	(r271563)
+++ user/jmmv/autotest/node/iterate.sh	Sun Sep 14 02:28:03 2014	(r271564)
@@ -227,7 +227,7 @@ EOF
 setenv PATH "/usr/local/bin:/usr/local/sbin:\${PATH}"
 
 cd /usr/tests
-kyua test
+kyua test --results-file=\${HOME}/results.db
 shutdown -p now
 EOF
 
@@ -292,13 +292,13 @@ autotest_publish() {
     local mddev="$(mdconfig -a -t vnode -f "${image}")"
     mount -o ro "/dev/${mddev}p3" "${chrootdir}/vmimage/mnt"
     mkdir -p "${datadir}"
-    cp "${chrootdir}/vmimage/mnt/root/.kyua/store.db" "${datadir}/store.db"
+    cp "${chrootdir}/vmimage/mnt/root/results.db" "${datadir}/results.db"
     umount "${chrootdir}/vmimage/mnt"
     mdconfig -d -u "${mddev}"
 
     shtk_process_run /usr/local/bin/kyua report-html \
         --output="${datadir}/results" \
-        --store="${datadir}/store.db" \
+        --results-file="${datadir}/results.db" \
         --results-filter=
 }