diff options
| author | Jason Merrill <jason@redhat.com> | 2002-03-20 19:29:09 -0500 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 2002-03-20 19:29:09 -0500 |
| commit | 617d988c057ee8dea59a796717596e7604a6e05f (patch) | |
| tree | 190ab28a44b232a3dc647eb0ebfbe61af0625baf | |
| parent | 1de21d0eac4b279d994709b0cd30bae0c9e711c7 (diff) | |
| download | gcc-617d988c057ee8dea59a796717596e7604a6e05f.zip gcc-617d988c057ee8dea59a796717596e7604a6e05f.tar.gz gcc-617d988c057ee8dea59a796717596e7604a6e05f.tar.bz2 | |
prune.exp (prune_gcc_output): Ignore Cygwin warning about ignoring -fpic.
* lib/prune.exp (prune_gcc_output): Ignore Cygwin warning about
ignoring -fpic.
* lib/old-dejagnu.exp (old-dejagnu): Also pass compiler output
through prune_gcc_output.
From-SVN: r51102
| -rw-r--r-- | gcc/testsuite/ChangeLog | 7 | ||||
| -rw-r--r-- | gcc/testsuite/g++.old-deja/g++.ext/instantiate3.C | 2 | ||||
| -rw-r--r-- | gcc/testsuite/g++.old-deja/g++.jason/template18.C | 4 | ||||
| -rw-r--r-- | gcc/testsuite/lib/old-dejagnu.exp | 2 | ||||
| -rw-r--r-- | gcc/testsuite/lib/prune.exp | 3 |
5 files changed, 16 insertions, 2 deletions
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index ca6d0b2..00722ab 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,10 @@ +2002-03-20 Jason Merrill <jason@redhat.com> + + * lib/prune.exp (prune_gcc_output): Ignore Cygwin warning about + ignoring -fpic. + * lib/old-dejagnu.exp (old-dejagnu): Also pass compiler output + through prune_gcc_output. + 2002-03-20 Jakub Jelinek <jakub@redhat.com> * gcc.c-torture/compile/20020320-1.c: New test. diff --git a/gcc/testsuite/g++.old-deja/g++.ext/instantiate3.C b/gcc/testsuite/g++.old-deja/g++.ext/instantiate3.C index 18d5a57..f3149d1 100644 --- a/gcc/testsuite/g++.old-deja/g++.ext/instantiate3.C +++ b/gcc/testsuite/g++.old-deja/g++.ext/instantiate3.C @@ -10,7 +10,7 @@ template <class T> struct A { inline template struct A<int>; A<int> a; // gets bogus error -A<char> b; // ERROR - not instantiated XFAIL mips*-*-* *-*-hpux* +A<char> b; // ERROR - not instantiated XFAIL mips*-*-* *-*-hpux* i?86-pc-cygwin // Irix's default linker does not // produce line numbers so XFAIL it. // Similarly for HPUX. diff --git a/gcc/testsuite/g++.old-deja/g++.jason/template18.C b/gcc/testsuite/g++.old-deja/g++.jason/template18.C index fa004d2..e57739b 100644 --- a/gcc/testsuite/g++.old-deja/g++.jason/template18.C +++ b/gcc/testsuite/g++.old-deja/g++.jason/template18.C @@ -4,6 +4,10 @@ // We mark this XFAIL because we can't test for expected linker errors. // If we get an XPASS for this testcase, that's a bug. + +// Suppressed-instantiation tests like this are known to break on +// Cygwin, because of the MULTIPLE_SYMBOL_SPACES stuff. This is OK. + // (OK) excess errors test - XFAIL *-*-* #pragma implementation "irrelevant_file" diff --git a/gcc/testsuite/lib/old-dejagnu.exp b/gcc/testsuite/lib/old-dejagnu.exp index 105c37d..2e2acff 100644 --- a/gcc/testsuite/lib/old-dejagnu.exp +++ b/gcc/testsuite/lib/old-dejagnu.exp @@ -443,7 +443,7 @@ proc old-dejagnu { compiler prog name cflagsx default_cflags libs } { } # Delete things like "ld.so: warning" messages. - set comp_output [prune_warnings $comp_output] + set comp_output [prune_gcc_output [prune_warnings $comp_output]] if [regexp "Internal (compiler )?error" $comp_output] then { if $expect_crash then { diff --git a/gcc/testsuite/lib/prune.exp b/gcc/testsuite/lib/prune.exp index 2752634..38b24e0 100644 --- a/gcc/testsuite/lib/prune.exp +++ b/gcc/testsuite/lib/prune.exp @@ -24,6 +24,9 @@ proc prune_gcc_output { text } { regsub -all "(^|\n)collect2: ld returned \[^\n\]*" $text "" text regsub -all "(^|\n)Please submit.*instructions\[^\n\]*" $text "" text + # Ignore harmless -fpic warnings on cygwin. + regsub -all "(^|\n)\[^\n\]*: warning: -f(pic|PIC) ignored for target\[^\n\]*" $text "" text + # It would be nice to avoid passing anything to gcc that would cause it to # issue these messages (since ignoring them seems like a hack on our part), # but that's too difficult in the general case. For example, sometimes |