From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 12691 invoked by alias); 25 Mar 2011 10:39:56 -0000 Received: (qmail 12679 invoked by uid 22791); 25 Mar 2011 10:39:55 -0000 X-SWARE-Spam-Status: No, hits=-1.9 required=5.0 tests=AWL,BAYES_00,SPF_HELO_PASS,TW_FC,TW_GC,TW_JG,T_RP_MATCHES_RCVD X-Spam-Check-By: sourceware.org Received: from lo.gmane.org (HELO lo.gmane.org) (80.91.229.12) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Fri, 25 Mar 2011 10:39:48 +0000 Received: from list by lo.gmane.org with local (Exim 4.69) (envelope-from ) id 1Q34Qk-0001ic-9r for gcc-patches@gcc.gnu.org; Fri, 25 Mar 2011 11:39:46 +0100 Received: from 93-34-210-217.ip51.fastwebnet.it ([93.34.210.217]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Fri, 25 Mar 2011 11:39:46 +0100 Received: from bonzini by 93-34-210-217.ip51.fastwebnet.it with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Fri, 25 Mar 2011 11:39:46 +0100 To: gcc-patches@gcc.gnu.org From: Paolo Bonzini Subject: Re: [testsuite, build] Convert boehm-gc testsuite to DejaGnu (PR boehm-gc/11412) Date: Fri, 25 Mar 2011 10:39:00 -0000 Message-ID: <4D8C70E7.4040409@gnu.org> References: <20110106211734.GG17791@gmx.de> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Cc: Mike Stump , IainS , Ralf Wildenhues , GCC Patches , Hans Boehm , Ben Elliston User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.2.13) Gecko/20101209 Fedora/3.1.7-0.35.b3pre.fc14 Lightning/1.0b3pre Mnenhy/0.8.3 Thunderbird/3.1.7 In-Reply-To: X-IsSubscribed: yes Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org X-SW-Source: 2011-03/txt/msg01722.txt.bz2 On 03/21/2011 01:59 PM, Rainer Orth wrote: > diff -r 8efcb4b03d45 boehm-gc/Makefile.am > --- a/boehm-gc/Makefile.am Sun Mar 20 14:28:11 2011 +0100 > +++ b/boehm-gc/Makefile.am Sun Mar 20 21:37:14 2011 +0100 > @@ -4,10 +4,10 @@ > ## files that should be in the distribution are not mentioned in this > ## Makefile.am. > > -AUTOMAKE_OPTIONS = cygnus subdir-objects > +AUTOMAKE_OPTIONS = foreign subdir-objects > ACLOCAL_AMFLAGS = -I .. -I ../config > > -SUBDIRS = include > +SUBDIRS = include testsuite > > noinst_LTLIBRARIES = libgcjgc.la libgcjgc_convenience.la > > @@ -35,7 +35,7 @@ > > # Include THREADLIBS here to ensure that the correct versions of > # linuxthread semaphore functions get linked: > -libgcjgc_la_LIBADD = $(addobjs) $(THREADLIBS) $(UNWINDLIBS) > +libgcjgc_la_LIBADD = $(addobjs) $(THREADLIBS) > libgcjgc_la_DEPENDENCIES = $(addobjs) > libgcjgc_la_LDFLAGS = $(extra_ldflags_libgc) -version-info 1:2:0 -rpath $(toolexeclibdir) > libgcjgc_la_LINK = $(LINK) $(libgcjgc_la_LDFLAGS) > @@ -43,48 +43,11 @@ > libgcjgc_convenience_la_LIBADD = $(addobjs) > libgcjgc_convenience_la_DEPENDENCIES = $(addobjs) > > -AM_CXXFLAGS = $(GC_CFLAGS) > -AM_CFLAGS = $(GC_CFLAGS) > +AM_CXXFLAGS = $(GC_CFLAGS) $(THREADCFLAGS) > +AM_CFLAGS = $(GC_CFLAGS) $(THREADCFLAGS) > AM_LDFLAGS = $(shell $(top_srcdir)/../libtool-ldflags $(LDFLAGS)) > override CFLAGS := $(filter-out $(O0_CFLAGS), $(CFLAGS)) $(O0_CFLAGS) > > -test_ldadd = libgcjgc.la $(THREADLIBS) $(UNWINDLIBS) $(EXTRA_TEST_LIBS) > - > -check_PROGRAMS = gctest > -gctest_SOURCES = tests/test.c > -gctest_LDADD = $(test_ldadd) > -gctest_LDFLAGS = -shared-libgcc > -gctest_LINK = $(LINK) $(gctest_LDFLAGS) > -TESTS_ENVIRONMENT = LD_LIBRARY_PATH=../../$(MULTIBUILDTOP)gcc > -TESTS = gctest > - > -TESTS += leaktest$(EXEEXT) > -check_PROGRAMS += leaktest > -leaktest_SOURCES = tests/leak_test.c > -leaktest_LDADD = $(test_ldadd) > -leaktest_LDFLAGS = -shared-libgcc > -leaktest_LINK = $(LINK) $(leaktest_LDFLAGS) > - > -TESTS += middletest$(EXEEXT) > -check_PROGRAMS += middletest > -middletest_SOURCES = tests/middle.c > -middletest_LDADD = $(test_ldadd) > -middletest_LDFLAGS = -shared-libgcc > -middletest_LINK = $(LINK) $(middletest_LDFLAGS) > - > -TESTS += staticrootstest$(EXEEXT) > -check_PROGRAMS += staticrootstest > -staticrootstest_SOURCES = tests/staticrootstest.c > -staticrootstest_LDADD = $(test_ldadd) libstaticrootslib.la > -staticrootstest_LDFLAGS = -shared-libgcc > -staticrootstest_LINK = $(LINK) $(staticrootstest_LDFLAGS) > -check_LTLIBRARIES = libstaticrootslib.la > -libstaticrootslib_la_SOURCES = tests/staticrootslib.c > -libstaticrootslib_la_LIBADD = libgcjgc_convenience.la > -libstaticrootslib_la_LDFLAGS = -version-info 1:2:0 -no-undefined \ > - -rpath /nowhere -shared-libgcc > -libstaticrootslib_la_DEPENDENCIES = libgcjgc_convenience.la > - > ## FIXME: we shouldn't have to do this, but automake forces us to. > .s.lo: > ## We use -Wp,-P to strip #line directives. Irix `as' chokes on > @@ -116,7 +79,6 @@ > "PICFLAG_FOR_TARGET=$(PICFLAG_FOR_TARGET)" \ > "SHELL=$(SHELL)" \ > "EXPECT=$(EXPECT)" \ > - "RUNTEST=$(RUNTEST)" \ Leave this line here, and replace the definitions of EXPECT and RUNTEST in boehm-gc/testsuite/Makefile.am with this: EXPECT = expect Automake will provide a definition of RUNTEST on its own. I know this is likely cut-and-paste. :) I'll reply that mine is cut-and-paste from libstdc++-v3/testsuite/Makefile.am. > diff -r 8efcb4b03d45 boehm-gc/configure.ac > --- a/boehm-gc/configure.ac Sun Mar 20 14:28:11 2011 +0100 > +++ b/boehm-gc/configure.ac Sun Mar 20 21:37:14 2011 +0100 > @@ -123,6 +123,7 @@ > ) > > AM_CPPFLAGS="-I`cd $srcdir&& ${PWDCMD-pwd}`/include" > +THREADCFLAGS= > THREADLIBS= > case "$THREADS" in > no | none | single) > @@ -163,9 +164,9 @@ > *-*-hpux10*) > AC_MSG_WARN("Only HP-UX 11 POSIX threads are supported.") > ;; > - *-*-kfreebsd*-gnu) > + *-*-kfreebsd*-gnu) > AC_DEFINE(GC_FREEBSD_THREADS) > - INCLUDES="$INCLUDES -pthread" > + THREADCFLAGS=-pthread > THREADDLLIBS=-pthread Please change this THREADLIBS since you're at it. Otherwise, build parts are okay. Paolo From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 13694 invoked by alias); 25 Mar 2011 10:41:49 -0000 Received: (qmail 13685 invoked by uid 22791); 25 Mar 2011 10:41:48 -0000 X-SWARE-Spam-Status: No, hits=-0.9 required=5.0 tests=AWL,BAYES_50,DKIM_SIGNED,DKIM_VALID,FREEMAIL_FROM,RCVD_IN_DNSWL_LOW,TW_FC,TW_GC,TW_JG X-Spam-Check-By: sourceware.org Received: from mail-iy0-f175.google.com (HELO mail-iy0-f175.google.com) (209.85.210.175) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Fri, 25 Mar 2011 10:41:44 +0000 Received: by iye7 with SMTP id 7so494746iye.20 for ; Fri, 25 Mar 2011 03:41:44 -0700 (PDT) Received: by 10.231.115.209 with SMTP id j17mr633183ibq.19.1301049582793; Fri, 25 Mar 2011 03:39:42 -0700 (PDT) Received: from yakj.usersys.redhat.com (93-34-210-217.ip51.fastwebnet.it [93.34.210.217]) by mx.google.com with ESMTPS id g16sm582062ibb.54.2011.03.25.03.39.39 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 25 Mar 2011 03:39:41 -0700 (PDT) Message-ID: <4D8C70E7.4040409@gnu.org> Date: Fri, 25 Mar 2011 10:59:00 -0000 From: Paolo Bonzini User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.2.13) Gecko/20101209 Fedora/3.1.7-0.35.b3pre.fc14 Lightning/1.0b3pre Mnenhy/0.8.3 Thunderbird/3.1.7 MIME-Version: 1.0 Newsgroups: gmane.comp.gcc.patches To: Rainer Orth CC: Mike Stump , IainS , Ralf Wildenhues , GCC Patches , Hans Boehm , Ben Elliston Subject: Re: [testsuite, build] Convert boehm-gc testsuite to DejaGnu (PR boehm-gc/11412) References: <20110106211734.GG17791@gmx.de> In-Reply-To: Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org X-SW-Source: 2011-03/txt/msg01723.txt.bz2 Message-ID: <20110325105900.QOE6YhfvJ97FhJbRg-BM42gOF_wZcO6PLLUH5k1A4Es@z> On 03/21/2011 01:59 PM, Rainer Orth wrote: > diff -r 8efcb4b03d45 boehm-gc/Makefile.am > --- a/boehm-gc/Makefile.am Sun Mar 20 14:28:11 2011 +0100 > +++ b/boehm-gc/Makefile.am Sun Mar 20 21:37:14 2011 +0100 > @@ -4,10 +4,10 @@ > ## files that should be in the distribution are not mentioned in this > ## Makefile.am. > > -AUTOMAKE_OPTIONS = cygnus subdir-objects > +AUTOMAKE_OPTIONS = foreign subdir-objects > ACLOCAL_AMFLAGS = -I .. -I ../config > > -SUBDIRS = include > +SUBDIRS = include testsuite > > noinst_LTLIBRARIES = libgcjgc.la libgcjgc_convenience.la > > @@ -35,7 +35,7 @@ > > # Include THREADLIBS here to ensure that the correct versions of > # linuxthread semaphore functions get linked: > -libgcjgc_la_LIBADD = $(addobjs) $(THREADLIBS) $(UNWINDLIBS) > +libgcjgc_la_LIBADD = $(addobjs) $(THREADLIBS) > libgcjgc_la_DEPENDENCIES = $(addobjs) > libgcjgc_la_LDFLAGS = $(extra_ldflags_libgc) -version-info 1:2:0 -rpath $(toolexeclibdir) > libgcjgc_la_LINK = $(LINK) $(libgcjgc_la_LDFLAGS) > @@ -43,48 +43,11 @@ > libgcjgc_convenience_la_LIBADD = $(addobjs) > libgcjgc_convenience_la_DEPENDENCIES = $(addobjs) > > -AM_CXXFLAGS = $(GC_CFLAGS) > -AM_CFLAGS = $(GC_CFLAGS) > +AM_CXXFLAGS = $(GC_CFLAGS) $(THREADCFLAGS) > +AM_CFLAGS = $(GC_CFLAGS) $(THREADCFLAGS) > AM_LDFLAGS = $(shell $(top_srcdir)/../libtool-ldflags $(LDFLAGS)) > override CFLAGS := $(filter-out $(O0_CFLAGS), $(CFLAGS)) $(O0_CFLAGS) > > -test_ldadd = libgcjgc.la $(THREADLIBS) $(UNWINDLIBS) $(EXTRA_TEST_LIBS) > - > -check_PROGRAMS = gctest > -gctest_SOURCES = tests/test.c > -gctest_LDADD = $(test_ldadd) > -gctest_LDFLAGS = -shared-libgcc > -gctest_LINK = $(LINK) $(gctest_LDFLAGS) > -TESTS_ENVIRONMENT = LD_LIBRARY_PATH=../../$(MULTIBUILDTOP)gcc > -TESTS = gctest > - > -TESTS += leaktest$(EXEEXT) > -check_PROGRAMS += leaktest > -leaktest_SOURCES = tests/leak_test.c > -leaktest_LDADD = $(test_ldadd) > -leaktest_LDFLAGS = -shared-libgcc > -leaktest_LINK = $(LINK) $(leaktest_LDFLAGS) > - > -TESTS += middletest$(EXEEXT) > -check_PROGRAMS += middletest > -middletest_SOURCES = tests/middle.c > -middletest_LDADD = $(test_ldadd) > -middletest_LDFLAGS = -shared-libgcc > -middletest_LINK = $(LINK) $(middletest_LDFLAGS) > - > -TESTS += staticrootstest$(EXEEXT) > -check_PROGRAMS += staticrootstest > -staticrootstest_SOURCES = tests/staticrootstest.c > -staticrootstest_LDADD = $(test_ldadd) libstaticrootslib.la > -staticrootstest_LDFLAGS = -shared-libgcc > -staticrootstest_LINK = $(LINK) $(staticrootstest_LDFLAGS) > -check_LTLIBRARIES = libstaticrootslib.la > -libstaticrootslib_la_SOURCES = tests/staticrootslib.c > -libstaticrootslib_la_LIBADD = libgcjgc_convenience.la > -libstaticrootslib_la_LDFLAGS = -version-info 1:2:0 -no-undefined \ > - -rpath /nowhere -shared-libgcc > -libstaticrootslib_la_DEPENDENCIES = libgcjgc_convenience.la > - > ## FIXME: we shouldn't have to do this, but automake forces us to. > .s.lo: > ## We use -Wp,-P to strip #line directives. Irix `as' chokes on > @@ -116,7 +79,6 @@ > "PICFLAG_FOR_TARGET=$(PICFLAG_FOR_TARGET)" \ > "SHELL=$(SHELL)" \ > "EXPECT=$(EXPECT)" \ > - "RUNTEST=$(RUNTEST)" \ Leave this line here, and replace the definitions of EXPECT and RUNTEST in boehm-gc/testsuite/Makefile.am with this: EXPECT = expect Automake will provide a definition of RUNTEST on its own. I know this is likely cut-and-paste. :) I'll reply that mine is cut-and-paste from libstdc++-v3/testsuite/Makefile.am. > diff -r 8efcb4b03d45 boehm-gc/configure.ac > --- a/boehm-gc/configure.ac Sun Mar 20 14:28:11 2011 +0100 > +++ b/boehm-gc/configure.ac Sun Mar 20 21:37:14 2011 +0100 > @@ -123,6 +123,7 @@ > ) > > AM_CPPFLAGS="-I`cd $srcdir&& ${PWDCMD-pwd}`/include" > +THREADCFLAGS= > THREADLIBS= > case "$THREADS" in > no | none | single) > @@ -163,9 +164,9 @@ > *-*-hpux10*) > AC_MSG_WARN("Only HP-UX 11 POSIX threads are supported.") > ;; > - *-*-kfreebsd*-gnu) > + *-*-kfreebsd*-gnu) > AC_DEFINE(GC_FREEBSD_THREADS) > - INCLUDES="$INCLUDES -pthread" > + THREADCFLAGS=-pthread > THREADDLLIBS=-pthread Please change this THREADLIBS since you're at it. Otherwise, build parts are okay. Paolo