From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 20505 invoked by alias); 10 Dec 2006 13:43:38 -0000 Received: (qmail 20460 invoked from network); 10 Dec 2006 13:43:16 -0000 Received: from unknown (195.23.133.211) by sourceware.org with QMTP; 10 Dec 2006 13:43:16 -0000 Received: (qmail 7375 invoked from network); 10 Dec 2006 13:43:15 -0000 Received: from unknown (HELO mailfrt06.isp.novis.pt) ([195.23.133.198]) (envelope-sender ) by mailrly01.isp.novis.pt with compressed SMTP; 10 Dec 2006 13:43:15 -0000 Received: (qmail 25028 invoked from network); 10 Dec 2006 13:43:14 -0000 Received: from unknown (HELO [127.0.0.1]) ([195.23.225.203]) (envelope-sender ) by mailfrt06.isp.novis.pt with SMTP; 10 Dec 2006 13:43:14 -0000 Message-ID: <457C0EE7.1010306@portugalmail.pt> Date: Sun, 10 Dec 2006 13:43:00 -0000 From: Pedro Alves User-Agent: Mozilla/5.0 (Windows; U; Windows NT 5.1; pt-BR; rv:1.8.0.8) Gecko/20061025 Thunderbird/1.5.0.8 Mnenhy/0.7.4.0 MIME-Version: 1.0 To: gdb-patches@sourceware.org Subject: [PATCH] A few Cygwin testsuite fixes. Content-Type: multipart/mixed; boundary="------------060406060205080109020800" X-Antivirus: avast! (VPS 0655-1, 08-12-2006), Outbound message X-Antivirus-Status: Clean X-IsSubscribed: yes Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org X-SW-Source: 2006-12/txt/msg00149.txt.bz2 This is a multi-part message in MIME format. --------------060406060205080109020800 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Content-length: 838 Hi all, This patch fixes a few fails on i686-pc-cygwin. - It adds a few missing $EXEEXT. - Adds a new $DLLEXT variable for the dynamic library tests and uses it. Please review and commit. Cheers, Pedro Alves --- gdb/testsuite/ChangeLog: 2006-12-10 Pedro Alves * configure.ac: Check dynamic library extension. Pass down DLLEXT. * configure: Regenerate. * Makefile.in (DLLEXT): New variable. (just-check): Export DLLEXT. * lib/gdb.exp ($DLLEXT): Import from environment. * gdb.base/annota1.exp ($binfile): Append $EXEEXT. Expect "Loaded symbols for .*". * gdb.base/gdb1555.exp ($libobj): Append $DLLEXT instead of ".so". * gdb.base/pending.exp ($lib_sl): Append $DLLEXT instead of ".sl". * gdb.base/so-impl-ld.exp ($lib_sl): Append $DLLEXT instead of ".sl". --------------060406060205080109020800 Content-Type: text/plain; name="cygwin.diff" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="cygwin.diff" Content-length: 6640 Index: configure.ac =================================================================== RCS file: /cvs/src/src/gdb/testsuite/configure.ac,v retrieving revision 1.5 diff -u -p -r1.5 configure.ac --- configure.ac 21 Jun 2006 13:57:21 -0000 1.5 +++ configure.ac 10 Dec 2006 13:27:07 -0000 @@ -110,6 +110,18 @@ AC_CHECK_HEADERS(pthread.h) AC_EXEEXT +AC_MSG_CHECKING(for dynamic library extension) +case $target in + *-*-cygwin* | *-*-mingw* | *-*-pe*) + DLLEXT=".dll" + ;; + *) + DLLEXT=".so" + ;; +esac +AC_MSG_RESULT($DLLEXT) +AC_SUBST(DLLEXT) + AC_OUTPUT([Makefile \ gdb.ada/Makefile \ gdb.arch/Makefile gdb.asm/Makefile gdb.base/Makefile \ Index: Makefile.in =================================================================== RCS file: /cvs/src/src/gdb/testsuite/Makefile.in,v retrieving revision 1.14 diff -u -p -r1.14 Makefile.in --- Makefile.in 21 Jun 2006 13:57:21 -0000 1.14 +++ Makefile.in 10 Dec 2006 13:27:07 -0000 @@ -33,6 +33,7 @@ target_cpu = @gdb_target_cpu@ SHELL = @SHELL@ EXEEXT = @EXEEXT@ +DLLEXT = @DLLEXT@ SUBDIRS = @subdirs@ RPATH_ENVVAR = @RPATH_ENVVAR@ ALL_SUBDIRS = gdb.ada gdb.arch gdb.asm gdb.base gdb.cp gdb.disasm \ @@ -128,6 +129,7 @@ just-check: srcdir=${srcdir} ; export srcdir ; \ EXPECT=${EXPECT} ; export EXPECT ; \ EXEEXT=${EXEEXT} ; export EXEEXT ; \ + DLLEXT=${DLLEXT} ; export DLLEXT ; \ $(RPATH_ENVVAR)=$$rootme/../../expect:$$rootme/../../libstdc++:$$rootme/../../tk/unix:$$rootme/../../tcl/unix:$$rootme/../../bfd:$$rootme/../../opcodes:$$$(RPATH_ENVVAR); \ export $(RPATH_ENVVAR); \ if [ -f $${rootme}/../../expect/expect ] ; then \ Index: lib/gdb.exp =================================================================== RCS file: /cvs/src/src/gdb/testsuite/lib/gdb.exp,v retrieving revision 1.72 diff -u -p -r1.72 gdb.exp --- lib/gdb.exp 10 Nov 2006 16:58:53 -0000 1.72 +++ lib/gdb.exp 10 Dec 2006 13:27:12 -0000 @@ -73,6 +73,7 @@ set fullname_syntax "($fullname_syntax_P # Needed for some tests under Cygwin. global EXEEXT +global DLLEXT global env if ![info exists env(EXEEXT)] { @@ -81,6 +82,12 @@ if ![info exists env(EXEEXT)] { set EXEEXT $env(EXEEXT) } +if ![info exists env(DLLEXT)] { + set DLLEXT ".so" +} else { + set DLLEXT $env(DLLEXT) +} + ### Only procedures should come after this point. # Index: gdb.base/annota1.exp =================================================================== RCS file: /cvs/src/src/gdb/testsuite/gdb.base/annota1.exp,v retrieving revision 1.20 diff -u -p -r1.20 annota1.exp --- gdb.base/annota1.exp 12 Oct 2006 19:03:22 -0000 1.20 +++ gdb.base/annota1.exp 10 Dec 2006 13:27:13 -0000 @@ -40,7 +40,7 @@ set bug_id 0 set testfile "annota1" set srcfile ${testfile}.c -set binfile ${objdir}/${subdir}/${testfile} +set binfile ${objdir}/${subdir}/${testfile}$EXEEXT if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug nowarnings}] != "" } { untested annota1.exp @@ -150,7 +150,7 @@ gdb_expect { set binexp [string_to_regexp $binfile] send_gdb "run\n" gdb_expect { - -re "\r\n\032\032post-prompt\r\nStarting program: $binexp \(\r\n\r\n\032\032frames-invalid\)+\(\(\r\n\r\n\032\032frames-invalid\)|\(\r\n\r\n\032\032breakpoints-invalid\)\)*\r\n\r\n\032\032starting\(\r\n\r\n\032\032frames-invalid\)+\(\(\r\n\r\n\032\032frames-invalid\)|\(\r\n\r\n\032\032breakpoints-invalid\)\)*\r\n\r\n\032\032breakpoint 1\r\n\r\nBreakpoint 1, \r\n\032\032frame-begin 0 $hex\r\n\r\n\032\032frame-function-name\r\nmain\r\n\032\032frame-args\r\n \\(\\)\r\n\032\032frame-source-begin\r\n at \r\n\032\032frame-source-file\r\n.*annota1.c\r\n\032\032frame-source-file-end\r\n:\r\n\032\032frame-source-line\r\n$main_line\r\n\032\032frame-source-end\r\n\r\n\r\n\032\032source.*$srcfile:$main_line:.*:beg:$hex\r\n\r\n\032\032frame-end\r\n\r\n\032\032stopped.*$gdb_prompt$" { + -re "\r\n\032\032post-prompt\r\nStarting program: $binexp \(\(\r\n\r\n\032\032frames-invalid\)|\(\r\nLoaded symbols for .*\)\)+\(\(\r\n\r\n\032\032frames-invalid\)|\(\r\n\r\n\032\032breakpoints-invalid\)\)*\r\n\r\n\032\032starting\(\r\n\r\n\032\032frames-invalid\)+\(\(\r\n\r\n\032\032frames-invalid\)|\(\r\n\r\n\032\032breakpoints-invalid\)\)*\r\n\r\n\032\032breakpoint 1\r\n\r\nBreakpoint 1, \r\n\032\032frame-begin 0 $hex\r\n\r\n\032\032frame-function-name\r\nmain\r\n\032\032frame-args\r\n \\(\\)\r\n\032\032frame-source-begin\r\n at \r\n\032\032frame-source-file\r\n.*annota1.c\r\n\032\032frame-source-file-end\r\n:\r\n\032\032frame-source-line\r\n$main_line\r\n\032\032frame-source-end\r\n\r\n\r\n\032\032source.*$srcfile:$main_line:.*:beg:$hex\r\n\r\n\032\032frame-end\r\n\r\n\032\032stopped.*$gdb_prompt$" { pass "run until main breakpoint" } -re ".*$gdb_prompt$" { Index: gdb.base/gdb1555.exp =================================================================== RCS file: /cvs/src/src/gdb/testsuite/gdb.base/gdb1555.exp,v retrieving revision 1.2 diff -u -p -r1.2 gdb1555.exp --- gdb.base/gdb1555.exp 22 Jun 2006 19:53:46 -0000 1.2 +++ gdb.base/gdb1555.exp 10 Dec 2006 13:27:14 -0000 @@ -31,7 +31,7 @@ set srcfile ${testfile}.c set binfile ${objdir}/${subdir}/${testfile} set libsrc "${srcdir}/${subdir}/${libfile}.c" -set libobj "${objdir}/${subdir}/${libfile}.so" +set libobj "${objdir}/${subdir}/${libfile}$DLLEXT" set execsrc "${srcdir}/${subdir}/${srcfile}" remote_exec build "rm -f ${binfile}" Index: gdb.base/pending.exp =================================================================== RCS file: /cvs/src/src/gdb/testsuite/gdb.base/pending.exp,v retrieving revision 1.5 diff -u -p -r1.5 pending.exp --- gdb.base/pending.exp 28 Apr 2005 23:04:28 -0000 1.5 +++ gdb.base/pending.exp 10 Dec 2006 13:27:14 -0000 @@ -37,7 +37,7 @@ set libfile "pendshr" set srcfile $testfile.c set libsrc $srcdir/$subdir/$libfile.c set binfile $objdir/$subdir/$testfile -set lib_sl $objdir/$subdir/$libfile.sl +set lib_sl $objdir/$subdir/$libfile$DLLEXT set lib_opts debug set exec_opts [list debug shlib=$lib_sl] Index: gdb.base/so-impl-ld.exp =================================================================== RCS file: /cvs/src/src/gdb/testsuite/gdb.base/so-impl-ld.exp,v retrieving revision 1.7 diff -u -p -r1.7 so-impl-ld.exp --- gdb.base/so-impl-ld.exp 29 Apr 2005 20:45:32 -0000 1.7 +++ gdb.base/so-impl-ld.exp 10 Dec 2006 13:27:15 -0000 @@ -32,7 +32,7 @@ set libfile "solib1" set srcfile $srcdir/$subdir/$testfile.c set libsrc $srcdir/$subdir/$libfile.c set binfile $objdir/$subdir/$testfile -set lib_sl $objdir/$subdir/$libfile.sl +set lib_sl $objdir/$subdir/$libfile$DLLEXT set lib_opts debug set exec_opts [list debug shlib=$lib_sl] --------------060406060205080109020800--