From fa80e0a6c85f7b534214f7b203bba50ff45f2cad Mon Sep 17 00:00:00 2001
From: "H.J. Lu" <hjl@gnu.org>
Date: Mon, 9 Feb 1998 01:07:31 +0000
Subject: [PATCH] old-dejagnu.exp (old-dejagnu): Added the "execution test -
 XFAIL *-*-*" handling in the spirit of "excess...

        * 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.

From-SVN: r17798
---
 gcc/testsuite/ChangeLog                        |  8 ++++++++
 gcc/testsuite/g++.old-deja/g++.jason/opeq5.C   |  2 +-
 gcc/testsuite/g++.old-deja/g++.law/code-gen3.C |  2 +-
 gcc/testsuite/g++.old-deja/g++.mike/p6610a.C   |  2 +-
 gcc/testsuite/g++.old-deja/g++.mike/p7325.C    |  2 +-
 gcc/testsuite/lib/old-dejagnu.exp              | 12 ++++++++++--
 6 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 48c4d76b739..6c1c10b0516 100644
--- 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 c591830515b..51b3e6e237c 100644
--- 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 0635d278197..a9de4838ca1 100644
--- 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 124260bb1cc..b9ea4b769bb 100644
--- 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 8402a36cc34..9cf4604daab 100644
--- 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 02f84a46cb9..32e5e52caab 100644
--- 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
 	    }
-- 
2.30.2