aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorJeffrey Oldham <oldham@codesourcery.com>2001-01-15 03:56:07 +0000
committerJeffrey D. Oldham <oldham@gcc.gnu.org>2001-01-15 03:56:07 +0000
commite3585d4f8629eca9ef2ed87bfcf6584804322552 (patch)
tree03b261f6745d1cfb1b050468c199cf6d3b973f45 /gcc
parentea4f1fce751a54c91ac3a4bc72141709499bf36b (diff)
downloadgcc-e3585d4f8629eca9ef2ed87bfcf6584804322552.zip
gcc-e3585d4f8629eca9ef2ed87bfcf6584804322552.tar.gz
gcc-e3585d4f8629eca9ef2ed87bfcf6584804322552.tar.bz2
ecos.exp (conpr-1.C): XFAIL if compile emits message containing "init_priority".
2001-01-14 Jeffrey Oldham <oldham@codesourcery.com> * g++.dg/special/ecos.exp (conpr-1.C): XFAIL if compile emits message containing "init_priority". (conpr-2.C): Likewise. (conpr-3.C): Likewise. * g++.old-deja/g++.ext/initp1.C: XFAIL for Irix. From-SVN: r39024
Diffstat (limited to 'gcc')
-rw-r--r--gcc/testsuite/ChangeLog8
-rw-r--r--gcc/testsuite/g++.dg/special/ecos.exp21
-rw-r--r--gcc/testsuite/g++.old-deja/g++.ext/initp1.C1
3 files changed, 26 insertions, 4 deletions
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 95a0cfe..544e49d 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,11 @@
+2001-01-14 Jeffrey Oldham <oldham@codesourcery.com>
+
+ * g++.dg/special/ecos.exp (conpr-1.C): XFAIL if compile emits
+ message containing "init_priority".
+ (conpr-2.C): Likewise.
+ (conpr-3.C): Likewise.
+ * g++.old-deja/g++.ext/initp1.C: XFAIL for Irix.
+
2001-01-14 Franz Sirl <Franz.Sirl-kernel@lauterbach.com>
* gcc.c-torture/execute/20010114-2.c: New test.
diff --git a/gcc/testsuite/g++.dg/special/ecos.exp b/gcc/testsuite/g++.dg/special/ecos.exp
index 373cc86..af3d8c1 100644
--- a/gcc/testsuite/g++.dg/special/ecos.exp
+++ b/gcc/testsuite/g++.dg/special/ecos.exp
@@ -1,4 +1,4 @@
-# Copyright (C) 1999 Free Software Foundation, Inc.
+# Copyright (C) 1999, 2001 Free Software Foundation, Inc.
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -29,7 +29,16 @@ load_lib g++-dg.exp
###########
dg-init
-dg-runtest "$srcdir/$subdir/conpr-1.C" "" ""
+set lines [g++_target_compile "$srcdir/$subdir/conpr-1.C" "$srcdir/$subdir/a.out" executable ""]
+if [string match "*init_priority*" $lines] then {
+ xfail "conpr-1.C"
+ file delete $srcdir/$subdir/a.out
+} elseif ![string match "" $lines] then {
+ fail "conpr-1.C"
+} else {
+ dg-runtest "$srcdir/$subdir/conpr-1.C" "" ""
+ file delete $srcdir/$subdir/a.out
+}
dg-finish
@@ -40,7 +49,9 @@ dg-finish
dg-init
set lines [g++_target_compile "$srcdir/$subdir/conpr-2a.C" "conpr-2a.o" object ""]
-if ![string match "" $lines] then {
+if [string match "*init_priority*" $lines] then {
+ xfail "conpr-2a.o"
+} elseif ![string match "" $lines] then {
fail "conpr-2a.o"
} else {
dg-runtest "$srcdir/$subdir/conpr-2.C" "conpr-2a.o" ""
@@ -56,7 +67,9 @@ dg-finish
dg-init
set lines [g++_target_compile "$srcdir/$subdir/conpr-3a.C" "conpr-3a.o" object ""]
-if ![string match "" $lines] then {
+if [string match "*init_priority*" $lines] then {
+ xfail "conpr-3a.o"
+} elseif ![string match "" $lines] then {
fail "conpr-3a.o"
} else {
set lines [g++_target_compile "$srcdir/$subdir/conpr-3b.C" "conpr-3b.o" object ""]
diff --git a/gcc/testsuite/g++.old-deja/g++.ext/initp1.C b/gcc/testsuite/g++.old-deja/g++.ext/initp1.C
index f22290d..0e4c02c 100644
--- a/gcc/testsuite/g++.old-deja/g++.ext/initp1.C
+++ b/gcc/testsuite/g++.old-deja/g++.ext/initp1.C
@@ -1,5 +1,6 @@
// Test for proper handling of the init_priority attribute.
// Contributed by Hugo Tyson <hmt@cygnus.co.uk>
+// excess errors test - XFAIL mips*-sgi-irix*
class Two {
private: