From owner-svn-soc-all@freebsd.org  Fri Aug 14 02:07:54 2015
Return-Path: <owner-svn-soc-all@freebsd.org>
Delivered-To: svn-soc-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 54E5E99F7C8
 for <svn-soc-all@mailman.ysv.freebsd.org>;
 Fri, 14 Aug 2015 02:07:54 +0000 (UTC)
 (envelope-from clord@FreeBSD.org)
Received: from socsvn.freebsd.org (socsvn.freebsd.org
 [IPv6:2001:1900:2254:206a::50:2])
 (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 45C251D88
 for <svn-soc-all@FreeBSD.org>; Fri, 14 Aug 2015 02:07:54 +0000 (UTC)
 (envelope-from clord@FreeBSD.org)
Received: from socsvn.freebsd.org ([127.0.1.124])
 by socsvn.freebsd.org (8.15.2/8.15.2) with ESMTP id t7E27sn3029147
 for <svn-soc-all@FreeBSD.org>; Fri, 14 Aug 2015 02:07:54 GMT
 (envelope-from clord@FreeBSD.org)
Received: (from www@localhost)
 by socsvn.freebsd.org (8.15.2/8.15.2/Submit) id t7E27rw7029136
 for svn-soc-all@FreeBSD.org; Fri, 14 Aug 2015 02:07:53 GMT
 (envelope-from clord@FreeBSD.org)
Date: Fri, 14 Aug 2015 02:07:53 GMT
Message-Id: <201508140207.t7E27rw7029136@socsvn.freebsd.org>
X-Authentication-Warning: socsvn.freebsd.org: www set sender to
 clord@FreeBSD.org using -f
From: clord@FreeBSD.org
To: svn-soc-all@FreeBSD.org
Subject: socsvn commit: r289732 - soc2015/clord/head/sys/contrib/ficl
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-soc-all@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the entire Summer of Code repository
 <svn-soc-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-soc-all>,
 <mailto:svn-soc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-soc-all/>
List-Post: <mailto:svn-soc-all@freebsd.org>
List-Help: <mailto:svn-soc-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-soc-all>,
 <mailto:svn-soc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 14 Aug 2015 02:07:54 -0000

Author: clord
Date: Fri Aug 14 02:07:53 2015
New Revision: 289732
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=289732

Log:
  Include a test for TESTMAIN around pcibios functions.
  

Modified:
  soc2015/clord/head/sys/contrib/ficl/loader.c

Modified: soc2015/clord/head/sys/contrib/ficl/loader.c
==============================================================================
--- soc2015/clord/head/sys/contrib/ficl/loader.c	Fri Aug 14 02:05:39 2015	(r289731)
+++ soc2015/clord/head/sys/contrib/ficl/loader.c	Fri Aug 14 02:07:53 2015	(r289732)
@@ -729,6 +729,7 @@
 }
 
 
+#ifndef TESTMAIN
 #ifdef __i386__
 /*
  * pcibios-device-count (devid -- count)
@@ -863,6 +864,7 @@
 	stackPushINT(pVM->pStack, locator);
 }
 #endif
+#endif /* TESTMAIN */
 
 /*
 ** Retrieves free space remaining on the dictionary
@@ -931,6 +933,7 @@
     dictAppendWord(dp, "pnphandlers",ficlPnphandlers, FW_DEFAULT);
 #endif
 #endif
+#ifndef TESTMAIN
 #ifdef __i386__
     dictAppendWord(dp, "pcibios-device-count", ficlPciBiosCountDevices, FW_DEFAULT);
     dictAppendWord(dp, "pcibios-read-config", ficlPciBiosReadConfig, FW_DEFAULT);
@@ -939,6 +942,7 @@
     dictAppendWord(dp, "pcibios-find-device", ficlPciBiosFindDevice, FW_DEFAULT);
     dictAppendWord(dp, "pcibios-locator", ficlPciBiosLocator, FW_DEFAULT);
 #endif
+#endif
 
 #if defined(PC98)
     ficlSetEnv(pSys, "arch-pc98",         FICL_TRUE);