From owner-svn-soc-all@FreeBSD.ORG  Tue Aug  2 14:51:15 2011
Return-Path: <owner-svn-soc-all@FreeBSD.ORG>
Delivered-To: svn-soc-all@FreeBSD.org
Received: from socsvn.FreeBSD.org (unknown [IPv6:2001:4f8:fff6::2f])
	by hub.freebsd.org (Postfix) with SMTP id CD8731065686
	for <svn-soc-all@FreeBSD.org>; Tue,  2 Aug 2011 14:51:12 +0000 (UTC)
	(envelope-from gk@FreeBSD.org)
Received: by socsvn.FreeBSD.org (sSMTP sendmail emulation);
	Tue, 02 Aug 2011 14:51:12 +0000
Date: Tue, 02 Aug 2011 14:51:12 +0000
From: gk@FreeBSD.org
To: svn-soc-all@FreeBSD.org
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Message-Id: <20110802145112.CD8731065686@hub.freebsd.org>
Cc: 
Subject: socsvn commit: r224843 -
	soc2011/gk/ino64-head/tools/tools/shlib-compat/test
X-BeenThere: svn-soc-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the entire Summer of Code repository
	<svn-soc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/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: <http://lists.freebsd.org/mailman/listinfo/svn-soc-all>,
	<mailto:svn-soc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 02 Aug 2011 14:51:15 -0000

Author: gk
Date: Tue Aug  2 14:51:12 2011
New Revision: 224843
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=224843

Log:
  shlib-compat: Correct tests/ merge

Modified:
  soc2011/gk/ino64-head/tools/tools/shlib-compat/test/Makefile
  soc2011/gk/ino64-head/tools/tools/shlib-compat/test/regress.sh

Modified: soc2011/gk/ino64-head/tools/tools/shlib-compat/test/Makefile
==============================================================================
--- soc2011/gk/ino64-head/tools/tools/shlib-compat/test/Makefile	Tue Aug  2 14:50:59 2011	(r224842)
+++ soc2011/gk/ino64-head/tools/tools/shlib-compat/test/Makefile	Tue Aug  2 14:51:12 2011	(r224843)
@@ -13,7 +13,7 @@
 	prove ${.CURDIR}
 
 regress.sh:
-	echo 'run() { ../shlib-compat -vv libtest$$1/libtest$$1.so.0 libtest$$2/libtest$$2.so.0; }' > ${.TARGET}
+	echo 'run() { ../shlib-compat --no-dump -vv libtest$$1/libtest$$1.so.0 libtest$$2/libtest$$2.so.0; }' > ${.TARGET}
 	N=`expr ${NUMTEST} \* ${NUMTEST}`; echo "echo 1..$$N" >> ${.TARGET}
 	echo 'REGRESSION_START($$1)' >> ${.TARGET}
 	for a in `jot ${NUMTEST}`; do for b in `jot ${NUMTEST}`; do echo "REGRESSION_TEST(\`$$a-$$b', \`run $$a $$b')"; done; done >> ${.TARGET}

Modified: soc2011/gk/ino64-head/tools/tools/shlib-compat/test/regress.sh
==============================================================================
--- soc2011/gk/ino64-head/tools/tools/shlib-compat/test/regress.sh	Tue Aug  2 14:50:59 2011	(r224842)
+++ soc2011/gk/ino64-head/tools/tools/shlib-compat/test/regress.sh	Tue Aug  2 14:51:12 2011	(r224843)
@@ -1,4 +1,4 @@
-run() { ../shlib-compat -vv libtest$1/libtest$1.so.0 libtest$2/libtest$2.so.0; }
+run() { ../shlib-compat --no-dump -vv libtest$1/libtest$1.so.0 libtest$2/libtest$2.so.0; }
 echo 1..9
 REGRESSION_START($1)
 REGRESSION_TEST(`1-1', `run 1 1')