From owner-svn-src-user@FreeBSD.ORG  Sat Jun 28 04:27:01 2014
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 0DA2520C;
 Sat, 28 Jun 2014 04:27:01 +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 EFD602089;
 Sat, 28 Jun 2014 04:27:00 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s5S4R0aY013848;
 Sat, 28 Jun 2014 04:27:00 GMT (envelope-from marcel@svn.freebsd.org)
Received: (from marcel@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s5S4R0bk013847;
 Sat, 28 Jun 2014 04:27:00 GMT (envelope-from marcel@svn.freebsd.org)
Message-Id: <201406280427.s5S4R0bk013847@svn.freebsd.org>
From: Marcel Moolenaar <marcel@FreeBSD.org>
Date: Sat, 28 Jun 2014 04:27:00 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r267997 - user/marcel/mkimg
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
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: Sat, 28 Jun 2014 04:27:01 -0000

Author: marcel
Date: Sat Jun 28 04:27:00 2014
New Revision: 267997
URL: http://svnweb.freebsd.org/changeset/base/267997

Log:
  Support unit testing:
  o   use mkimg_uuid() instead of uuidgen().
  o   Check unit_testing in vhd_timestamp() to synthesize a time.

Modified:
  user/marcel/mkimg/vhd.c

Modified: user/marcel/mkimg/vhd.c
==============================================================================
--- user/marcel/mkimg/vhd.c	Sat Jun 28 04:19:43 2014	(r267996)
+++ user/marcel/mkimg/vhd.c	Sat Jun 28 04:27:00 2014	(r267997)
@@ -141,8 +141,12 @@ vhd_timestamp(void)
 {
 	time_t t;
 
-	t = time(NULL);
-	return (t - 0x386d4380);
+	if (!unit_testing) {
+		t = time(NULL);
+		return (t - 0x386d4380);
+	}
+
+	return (0x01234567);
 }
 
 static void
@@ -189,7 +193,7 @@ vhd_write(int fd)
 	be64enc(&footer.current_size, imgsz);
 	/* XXX Geometry */
 	be32enc(&footer.disk_type, VHD_DISK_TYPE_DYNAMIC);
-	uuidgen(&id, 1);
+	mkimg_uuid(&id);
 	vhd_uuid_enc(&footer.id, &id);
 	be32enc(&footer.checksum, vhd_checksum(&footer, sizeof(footer)));
 	if (sparse_write(fd, &footer, sizeof(footer)) < 0)