* lib/old-dejagnu.exp (old-dejagnu): Added the

        "execution test - XFAIL *-*-*" handling in the spirit of
        "excess errors test -". Changed the "execution test fails"
        handling to be like "excess errors test fails".
        * Update various tests accordingly.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@17798 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 48c4d76..6c1c10b 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,11 @@
+Mon Feb  9 02:08:47 1998  H.J. Lu  (hjl@gnu.org)
+
+        * lib/old-dejagnu.exp (old-dejagnu): Added the
+        "execution test - XFAIL *-*-*" handling in the spirit of
+        "excess errors test -". Changed the "execution test fails"
+        handling to be like "excess errors test fails".
+        * Update various tests accordingly.
+
 Sun Jan 18 01:33:59 1998  Jeffrey A Law  (law@cygnus.com)
 
        * lib/c-torture.exp: Look for .x files instead of .cexp files.

diff --git a/gcc/testsuite/g++.old-deja/g++.jason/opeq5.C b/gcc/testsuite/g++.old-deja/g++.jason/opeq5.C
index c591830..51b3e6e 100644 (file)
--- a/gcc/testsuite/g++.old-deja/g++.jason/opeq5.C
+++ b/gcc/testsuite/g++.old-deja/g++.jason/opeq5.C
@@ -1,7 +1,7 @@
 // Testcase for tricky synthesized op= in complex inheritance situation.
 // See discussion in g++int.texi.
 
-// execution test fails - 
+// execution test - XFAIL *-*-*
 
 int count = 0;
 extern "C" int printf (const char *, ...);

diff --git a/gcc/testsuite/g++.old-deja/g++.law/code-gen3.C b/gcc/testsuite/g++.old-deja/g++.law/code-gen3.C
index 0635d27..a9de483 100644 (file)
--- a/gcc/testsuite/g++.old-deja/g++.law/code-gen3.C
+++ b/gcc/testsuite/g++.old-deja/g++.law/code-gen3.C
@@ -1,5 +1,5 @@
 // GROUPS passed code-generation
-// execution test fails - 
+// execution test - XFAIL *-*-*
 // code-gen file
 // From: mscha@anne.wifo.uni-mannheim.de (Martin Schader)
 // Date:     Wed, 4 Aug 93 19:14:52 +0200

diff --git a/gcc/testsuite/g++.old-deja/g++.mike/p6610a.C b/gcc/testsuite/g++.old-deja/g++.mike/p6610a.C
index 124260b..b9ea4b7 100644 (file)
--- a/gcc/testsuite/g++.old-deja/g++.mike/p6610a.C
+++ b/gcc/testsuite/g++.old-deja/g++.mike/p6610a.C
@@ -1,6 +1,6 @@
 // prms-id: 6610
 // There is a bug in vtable thunks with multiple/virtual inheritance.
-// execution test fails - XFAIL *-*-linux-gnu *-*-linux
+// execution test - XFAIL *-*-linux-gnu *-*-linux
 int fail = 1;
 struct B;
 struct A { virtual int f(const B*) = 0; int g(const B*); };

diff --git a/gcc/testsuite/g++.old-deja/g++.mike/p7325.C b/gcc/testsuite/g++.old-deja/g++.mike/p7325.C
index 8402a36..9cf4604 100644 (file)
--- a/gcc/testsuite/g++.old-deja/g++.mike/p7325.C
+++ b/gcc/testsuite/g++.old-deja/g++.mike/p7325.C
@@ -1,7 +1,7 @@
 // I hate this type of test case.  I'm not sure how to code it better.
 // See the PR for what this tests.
 // prms-id: 7325
-// execution test fails *-*-*
+// execution test - XFAIL *-*-*
 
 int fail = 0;
 

diff --git a/gcc/testsuite/lib/old-dejagnu.exp b/gcc/testsuite/lib/old-dejagnu.exp
index 02f84a4..32e5e52 100644 (file)
--- a/gcc/testsuite/lib/old-dejagnu.exp
+++ b/gcc/testsuite/lib/old-dejagnu.exp
@@ -361,10 +361,16 @@ proc old-dejagnu { compiler prog cflagsx default_cflags libs } {
        set message [concat $message $tmp]
     }
 
-    set tmp [process-option $prog "execution test fails" "an execution failure" EXEC $text]
+    set tmp [process-option $prog "execution test fails" "an execution failure" EXECO $text]
     if ![string match "" $tmp] then {
        set execbug_flag 1
        set message [concat $message $tmp]
+       warning "please use execution test - XFAIL *-*-* in $prog instead"
+    }
+
+    set tmp [process-option $prog "execution test - " "an excess error failure" EXEC $text]
+    if ![string match "" $tmp] then {
+       set message [concat $message $tmp]
     }
 
     set tmp [process-option $prog "excess errors test fails" "an excess error failure" EXCESSO $text]
@@ -472,7 +478,9 @@ proc old-dejagnu { compiler prog cflagsx default_cflags libs } {
            "XBADASM" {
                x$uhoh "$name $pattern (test for bad assembler, line $line)"
            }
-           "XEXEC" { }
+           "XEXEC" {
+               set execbug_flag 1
+           }
            "XEXCESS" {
                set excessbug_flag 1
            }