From d29de343fef4c116ed11d40f05f45f3f795ff4b4 Mon Sep 17 00:00:00 2001
From: Jason Merrill <jason@gcc.gnu.org>
Date: Tue, 22 Aug 2000 14:16:12 -0400
Subject: [PATCH] fix so failures are diagnosed

From-SVN: r35881
---
 gcc/testsuite/g++.old-deja/g++.brendan/code-gen1.C  |  2 +-
 gcc/testsuite/g++.old-deja/g++.brendan/code-gen2.C  |  2 +-
 gcc/testsuite/g++.old-deja/g++.brendan/code-gen3.C  |  2 +-
 gcc/testsuite/g++.old-deja/g++.brendan/code-gen6.C  |  2 +-
 gcc/testsuite/g++.old-deja/g++.brendan/copy1.C      |  2 +-
 gcc/testsuite/g++.old-deja/g++.brendan/copy7.C      |  2 +-
 gcc/testsuite/g++.old-deja/g++.brendan/copy9.C      |  5 ++++-
 gcc/testsuite/g++.old-deja/g++.brendan/ctors1.C     |  2 +-
 gcc/testsuite/g++.old-deja/g++.brendan/ctors2.C     |  2 +-
 gcc/testsuite/g++.old-deja/g++.brendan/dtors1.C     |  2 +-
 gcc/testsuite/g++.old-deja/g++.brendan/dtors2.C     |  2 +-
 gcc/testsuite/g++.old-deja/g++.brendan/dtors3.C     |  2 +-
 gcc/testsuite/g++.old-deja/g++.brendan/misc7.C      |  2 +-
 gcc/testsuite/g++.old-deja/g++.brendan/nest21.C     |  2 +-
 gcc/testsuite/g++.old-deja/g++.brendan/new2.C       |  2 +-
 gcc/testsuite/g++.old-deja/g++.brendan/new3.C       |  2 +-
 gcc/testsuite/g++.old-deja/g++.brendan/operators5.C |  2 +-
 gcc/testsuite/g++.old-deja/g++.brendan/overload2.C  |  2 +-
 gcc/testsuite/g++.old-deja/g++.brendan/overload7.C  |  2 +-
 gcc/testsuite/g++.old-deja/g++.brendan/ptolemy2.C   |  7 +++----
 gcc/testsuite/g++.old-deja/g++.brendan/redecl2.C    |  2 +-
 gcc/testsuite/g++.old-deja/g++.brendan/reference1.C |  2 +-
 gcc/testsuite/g++.old-deja/g++.brendan/sizeof5.C    |  2 +-
 gcc/testsuite/g++.old-deja/g++.law/arg5.C           |  2 +-
 gcc/testsuite/g++.old-deja/g++.law/arg7.C           |  7 +++----
 gcc/testsuite/g++.old-deja/g++.law/arm4.C           |  2 +-
 gcc/testsuite/g++.old-deja/g++.law/arm5.C           |  2 +-
 gcc/testsuite/g++.old-deja/g++.law/arm7.C           |  9 ++++-----
 gcc/testsuite/g++.old-deja/g++.law/array1.C         |  2 +-
 gcc/testsuite/g++.old-deja/g++.law/bit-fields2.C    |  2 +-
 gcc/testsuite/g++.old-deja/g++.law/code-gen1.C      |  2 +-
 gcc/testsuite/g++.old-deja/g++.law/code-gen5.C      |  2 +-
 gcc/testsuite/g++.old-deja/g++.law/copy1.C          |  2 +-
 gcc/testsuite/g++.old-deja/g++.law/ctors12.C        |  2 +-
 gcc/testsuite/g++.old-deja/g++.law/ctors16.C        |  2 +-
 gcc/testsuite/g++.old-deja/g++.law/ctors2.C         |  2 +-
 gcc/testsuite/g++.old-deja/g++.law/ctors8.C         |  2 +-
 gcc/testsuite/g++.old-deja/g++.law/cvt12.C          |  2 +-
 gcc/testsuite/g++.old-deja/g++.law/cvt2.C           |  5 ++++-
 gcc/testsuite/g++.old-deja/g++.law/cvt7.C           |  2 +-
 gcc/testsuite/g++.old-deja/g++.law/dtors3.C         |  2 +-
 gcc/testsuite/g++.old-deja/g++.law/dtors5.C         |  2 +-
 gcc/testsuite/g++.old-deja/g++.law/enum9.C          |  2 +-
 gcc/testsuite/g++.old-deja/g++.law/global-init1.C   |  2 +-
 gcc/testsuite/g++.old-deja/g++.law/init11.C         |  2 +-
 gcc/testsuite/g++.old-deja/g++.law/init14.C         |  2 +-
 gcc/testsuite/g++.old-deja/g++.law/init9.C          |  2 +-
 gcc/testsuite/g++.old-deja/g++.law/operators15.C    |  2 +-
 gcc/testsuite/g++.old-deja/g++.law/operators16.C    |  2 +-
 gcc/testsuite/g++.old-deja/g++.law/operators27.C    |  2 +-
 gcc/testsuite/g++.old-deja/g++.law/operators30.C    |  2 +-
 gcc/testsuite/g++.old-deja/g++.law/operators8.C     | 10 ++++++----
 gcc/testsuite/g++.old-deja/g++.law/patches1.C       |  2 +-
 gcc/testsuite/g++.old-deja/g++.law/refs1.C          |  2 +-
 gcc/testsuite/g++.old-deja/g++.law/scope2.C         |  2 +-
 gcc/testsuite/g++.old-deja/g++.law/temps2.C         |  2 +-
 gcc/testsuite/g++.old-deja/g++.law/temps5.C         |  2 +-
 gcc/testsuite/g++.old-deja/g++.law/temps6.C         |  2 +-
 gcc/testsuite/g++.old-deja/g++.law/virtual4.C       |  2 +-
 59 files changed, 77 insertions(+), 72 deletions(-)

diff --git a/gcc/testsuite/g++.old-deja/g++.brendan/code-gen1.C b/gcc/testsuite/g++.old-deja/g++.brendan/code-gen1.C
index ddd419bb054..b1f77e1b66e 100644
--- a/gcc/testsuite/g++.old-deja/g++.brendan/code-gen1.C
+++ b/gcc/testsuite/g++.old-deja/g++.brendan/code-gen1.C
@@ -25,7 +25,7 @@ int main ()
 	if (test2 (global_base) == 0)
 	  printf ("PASS\n");
 	else
-	  printf ("FAIL\n");
+	  { printf ("FAIL\n"); return 1; }
 
 	return 0;
 }
diff --git a/gcc/testsuite/g++.old-deja/g++.brendan/code-gen2.C b/gcc/testsuite/g++.old-deja/g++.brendan/code-gen2.C
index 04361f896fb..72f589392e1 100644
--- a/gcc/testsuite/g++.old-deja/g++.brendan/code-gen2.C
+++ b/gcc/testsuite/g++.old-deja/g++.brendan/code-gen2.C
@@ -10,7 +10,7 @@ int main ()
 	char *tmp = &buff[0];	// also fails for char *tmp = buff;
 
 	if ((__SIZE_TYPE__) tmp != (__SIZE_TYPE__) &buff[0])
-	  printf ("FAIL\n");
+	  { printf ("FAIL\n"); return 1; }
 	else
 	  printf ("PASS\n");
 
diff --git a/gcc/testsuite/g++.old-deja/g++.brendan/code-gen3.C b/gcc/testsuite/g++.old-deja/g++.brendan/code-gen3.C
index a28e12fe39d..fcba4a03468 100644
--- a/gcc/testsuite/g++.old-deja/g++.brendan/code-gen3.C
+++ b/gcc/testsuite/g++.old-deja/g++.brendan/code-gen3.C
@@ -26,7 +26,7 @@ int test2 (struct base formal_base, int v1)
 	formal_base.f1 = formal_base.f2;	// prevent warnings
 
 	if (v1 != 0x5e5e)
-	  printf ("FAIL\n");
+	  { printf ("FAIL\n"); return 1; }
 	else
 	  printf ("PASS\n");
 
diff --git a/gcc/testsuite/g++.old-deja/g++.brendan/code-gen6.C b/gcc/testsuite/g++.old-deja/g++.brendan/code-gen6.C
index 95880809415..9c63774f38c 100644
--- a/gcc/testsuite/g++.old-deja/g++.brendan/code-gen6.C
+++ b/gcc/testsuite/g++.old-deja/g++.brendan/code-gen6.C
@@ -24,7 +24,7 @@ int main ()
 	tres_floats tf (v1, v2, v3);
 
 	if ((tf.get_f1() != v1) || (tf.get_f2() != v2) || (tf.get_f3() != v3))
-	  printf ("FAIL\n");
+	  { printf ("FAIL\n"); return 1; }
 	else
 	  printf ("PASS\n");
 
diff --git a/gcc/testsuite/g++.old-deja/g++.brendan/copy1.C b/gcc/testsuite/g++.old-deja/g++.brendan/copy1.C
index 4cba7309736..ca1c6167ce7 100644
--- a/gcc/testsuite/g++.old-deja/g++.brendan/copy1.C
+++ b/gcc/testsuite/g++.old-deja/g++.brendan/copy1.C
@@ -15,7 +15,7 @@ main ()
   C c2 (c1);
 
   if (count != 1)
-    printf ("FAIL\n");
+    { printf ("FAIL\n"); return 1; }
   else
     printf ("PASS\n");
 }
diff --git a/gcc/testsuite/g++.old-deja/g++.brendan/copy7.C b/gcc/testsuite/g++.old-deja/g++.brendan/copy7.C
index ec76f657946..1ed393da17d 100644
--- a/gcc/testsuite/g++.old-deja/g++.brendan/copy7.C
+++ b/gcc/testsuite/g++.old-deja/g++.brendan/copy7.C
@@ -26,5 +26,5 @@ main()
     A b(a);
 
     printf ("FAIL\n");
-    return 0;
+    return 1;
 }
diff --git a/gcc/testsuite/g++.old-deja/g++.brendan/copy9.C b/gcc/testsuite/g++.old-deja/g++.brendan/copy9.C
index 59fd2285419..e1cfb426120 100644
--- a/gcc/testsuite/g++.old-deja/g++.brendan/copy9.C
+++ b/gcc/testsuite/g++.old-deja/g++.brendan/copy9.C
@@ -37,5 +37,8 @@ main () {
 	if (b.doubleval == 23.2)
 	  cout << "PASS\n";
 	else
-	  cout << "FAIL\n";
+	  {
+	    cout << "FAIL\n";
+	    return 1;
+	  }
 }
diff --git a/gcc/testsuite/g++.old-deja/g++.brendan/ctors1.C b/gcc/testsuite/g++.old-deja/g++.brendan/ctors1.C
index 99f8c04860d..4b82843ea02 100644
--- a/gcc/testsuite/g++.old-deja/g++.brendan/ctors1.C
+++ b/gcc/testsuite/g++.old-deja/g++.brendan/ctors1.C
@@ -15,7 +15,7 @@ base global_base(0x55, 0xff);
 int main ()
 {
 	if ((global_base.f1 != 0x55) || (global_base.f2 != 0xff))
-	  printf ("FAIL\n");
+	  { printf ("FAIL\n"); return 1; }
 	else
 	  printf ("PASS\n");
 }
diff --git a/gcc/testsuite/g++.old-deja/g++.brendan/ctors2.C b/gcc/testsuite/g++.old-deja/g++.brendan/ctors2.C
index 64a790f40f0..6f1a36a9600 100644
--- a/gcc/testsuite/g++.old-deja/g++.brendan/ctors2.C
+++ b/gcc/testsuite/g++.old-deja/g++.brendan/ctors2.C
@@ -16,7 +16,7 @@ base global_base(0x55, 0x7e);
 int main ()
 {
 	if ((global_base.f1 != 0x55) || (global_base.f2 != 0x7e))
-	  printf ("FAIL\n");
+	  { printf ("FAIL\n"); return 1; }
 	else
 	  printf ("PASS\n");
 }
diff --git a/gcc/testsuite/g++.old-deja/g++.brendan/dtors1.C b/gcc/testsuite/g++.old-deja/g++.brendan/dtors1.C
index a6ce7e042ee..b48be858838 100644
--- a/gcc/testsuite/g++.old-deja/g++.brendan/dtors1.C
+++ b/gcc/testsuite/g++.old-deja/g++.brendan/dtors1.C
@@ -43,7 +43,7 @@ int main ()
 {
 	test2 ();
 	if ((base_destructed != 0x781f) || (derived_destructed != 0xf178))
-	  printf ("FAIL\n");
+	  { printf ("FAIL\n"); return 1; }
 	else
 	  printf ("PASS\n");
 }
diff --git a/gcc/testsuite/g++.old-deja/g++.brendan/dtors2.C b/gcc/testsuite/g++.old-deja/g++.brendan/dtors2.C
index a1d402934c6..1254cc670a2 100644
--- a/gcc/testsuite/g++.old-deja/g++.brendan/dtors2.C
+++ b/gcc/testsuite/g++.old-deja/g++.brendan/dtors2.C
@@ -55,7 +55,7 @@ int main ()
 	test ();
 
 	if (errors)
-	  printf ("FAIL\n");
+	  { printf ("FAIL\n"); return 1; }
 	else
 	  printf ("PASS\n");
 
diff --git a/gcc/testsuite/g++.old-deja/g++.brendan/dtors3.C b/gcc/testsuite/g++.old-deja/g++.brendan/dtors3.C
index 588cb22b4db..3485db71e4b 100644
--- a/gcc/testsuite/g++.old-deja/g++.brendan/dtors3.C
+++ b/gcc/testsuite/g++.old-deja/g++.brendan/dtors3.C
@@ -44,7 +44,7 @@ int main ()
 	delete dp;
 
 	if ((member_destructor_calls != 8) || (middle_destructor_calls != 2))
-	  printf ("FAIL\n");
+	  { printf ("FAIL\n"); return 1; }
 	else
 	  printf ("PASS\n");
 
diff --git a/gcc/testsuite/g++.old-deja/g++.brendan/misc7.C b/gcc/testsuite/g++.old-deja/g++.brendan/misc7.C
index 0d85bdcce07..aa179ca724e 100644
--- a/gcc/testsuite/g++.old-deja/g++.brendan/misc7.C
+++ b/gcc/testsuite/g++.old-deja/g++.brendan/misc7.C
@@ -9,7 +9,7 @@ int main()
   *pi = 4;
 
   if (i != 4)
-    printf ("FAIL\n");
+    { printf ("FAIL\n"); return 1; }
   else
     printf ("PASS\n");
 }
diff --git a/gcc/testsuite/g++.old-deja/g++.brendan/nest21.C b/gcc/testsuite/g++.old-deja/g++.brendan/nest21.C
index b866a3e5057..cce10c44cbd 100644
--- a/gcc/testsuite/g++.old-deja/g++.brendan/nest21.C
+++ b/gcc/testsuite/g++.old-deja/g++.brendan/nest21.C
@@ -90,7 +90,7 @@ int main()
     if (strcmp (output, " 1-a1-11-12-a2-12-1") == 0)
       printf ("PASS\n");
     else
-      printf ("FAIL\n");
+      { printf ("FAIL\n"); return 1; }
 
     return 0;
 }
diff --git a/gcc/testsuite/g++.old-deja/g++.brendan/new2.C b/gcc/testsuite/g++.old-deja/g++.brendan/new2.C
index b9482d936e9..72a8edf3ccb 100644
--- a/gcc/testsuite/g++.old-deja/g++.brendan/new2.C
+++ b/gcc/testsuite/g++.old-deja/g++.brendan/new2.C
@@ -41,7 +41,7 @@ int main ()
 	derived_ptr = new derived ();
 
 	if ((new_call_count != 2) || (errors != 0))
-	  printf ("FAIL\n");
+	  { printf ("FAIL\n"); return 1; }
 	else
 	  printf ("PASS\n");
 
diff --git a/gcc/testsuite/g++.old-deja/g++.brendan/new3.C b/gcc/testsuite/g++.old-deja/g++.brendan/new3.C
index 5f5c988c29a..c431331d9af 100644
--- a/gcc/testsuite/g++.old-deja/g++.brendan/new3.C
+++ b/gcc/testsuite/g++.old-deja/g++.brendan/new3.C
@@ -32,5 +32,5 @@ int main()
   if (pass)
     printf ("PASS\n");
   else
-    printf ("FAIL\n");
+    { printf ("FAIL\n"); return 1; }
 }
diff --git a/gcc/testsuite/g++.old-deja/g++.brendan/operators5.C b/gcc/testsuite/g++.old-deja/g++.brendan/operators5.C
index 230d3dbaa90..d4c89605d43 100644
--- a/gcc/testsuite/g++.old-deja/g++.brendan/operators5.C
+++ b/gcc/testsuite/g++.old-deja/g++.brendan/operators5.C
@@ -44,7 +44,7 @@ int main ()
 	k = !k;		// fib it!
 
 	if (k.i != 610)
-	  printf ("FAIL\n");
+	  { printf ("FAIL\n"); return 1; }
 	else
 	  printf ("PASS\n");
 
diff --git a/gcc/testsuite/g++.old-deja/g++.brendan/overload2.C b/gcc/testsuite/g++.old-deja/g++.brendan/overload2.C
index 44f24bd7bfb..de6b40663cc 100644
--- a/gcc/testsuite/g++.old-deja/g++.brendan/overload2.C
+++ b/gcc/testsuite/g++.old-deja/g++.brendan/overload2.C
@@ -37,7 +37,7 @@ int main ()
 	derived_object.method (message);
 
 	if (proper_method_called != 1)
-	  printf ("FAIL\n");
+	  { printf ("FAIL\n"); return 1; }
 	else
 	  printf ("PASS\n");
 }
diff --git a/gcc/testsuite/g++.old-deja/g++.brendan/overload7.C b/gcc/testsuite/g++.old-deja/g++.brendan/overload7.C
index 6e5efcf6630..252eb6d6b5d 100644
--- a/gcc/testsuite/g++.old-deja/g++.brendan/overload7.C
+++ b/gcc/testsuite/g++.old-deja/g++.brendan/overload7.C
@@ -37,5 +37,5 @@ int main()
 	if (x.first == 10 && x.second == 20 && y == 12.34)
 	  printf ("PASS\n");
 	else
-	  printf ("FAIL\n");
+	  { printf ("FAIL\n"); return 1; }
 }
diff --git a/gcc/testsuite/g++.old-deja/g++.brendan/ptolemy2.C b/gcc/testsuite/g++.old-deja/g++.brendan/ptolemy2.C
index 58a10dcec90..4fd7e184323 100644
--- a/gcc/testsuite/g++.old-deja/g++.brendan/ptolemy2.C
+++ b/gcc/testsuite/g++.old-deja/g++.brendan/ptolemy2.C
@@ -47,7 +47,7 @@ void printargs(char** argv) {
 int PTcl::one(int, char** argv) {
   cout << "FAIL\n";
 	printargs(argv);
-	return 0;
+	return 1;
 }
 
 int PTcl::two(int, char** argv) {
@@ -59,11 +59,10 @@ int PTcl::two(int, char** argv) {
 int PTcl::three(int, char** argv) {
   cout << "FAIL\n";
 	printargs(argv);
-	return 0;
+	return 1;
 }
 
 int main (int argc, char** argv) {
 	PTcl obj;
-	obj.dispatcher(1,argc,argv);
-	return 0;
+	return obj.dispatcher(1,argc,argv);
 }
diff --git a/gcc/testsuite/g++.old-deja/g++.brendan/redecl2.C b/gcc/testsuite/g++.old-deja/g++.brendan/redecl2.C
index 25f7b6bea29..700ff7ef608 100644
--- a/gcc/testsuite/g++.old-deja/g++.brendan/redecl2.C
+++ b/gcc/testsuite/g++.old-deja/g++.brendan/redecl2.C
@@ -32,7 +32,7 @@ int main ()
 	sender_2 ();
 	sender_3 ();
 	if (ii_sum != 13 || jj_sum != 25)
-	  printf ("FAIL\n");
+	  { printf ("FAIL\n"); return 1; }
 	else
 	  printf ("PASS\n");
 
diff --git a/gcc/testsuite/g++.old-deja/g++.brendan/reference1.C b/gcc/testsuite/g++.old-deja/g++.brendan/reference1.C
index 456d7ef5551..4df46363abb 100644
--- a/gcc/testsuite/g++.old-deja/g++.brendan/reference1.C
+++ b/gcc/testsuite/g++.old-deja/g++.brendan/reference1.C
@@ -35,7 +35,7 @@ int main ()
 	if (call_count == 1)
 	  printf ("PASS\n");
 	else
-	  printf ("FAIL\n");
+	  { printf ("FAIL\n"); return 1; }
 
 	return 0;
 }
diff --git a/gcc/testsuite/g++.old-deja/g++.brendan/sizeof5.C b/gcc/testsuite/g++.old-deja/g++.brendan/sizeof5.C
index 84bebcebe31..c23dc2f1ff2 100644
--- a/gcc/testsuite/g++.old-deja/g++.brendan/sizeof5.C
+++ b/gcc/testsuite/g++.old-deja/g++.brendan/sizeof5.C
@@ -13,5 +13,5 @@ main ()
   if (i > 0)
     printf ("PASS\n");
   else
-    printf ("FAIL\n");
+    { printf ("FAIL\n"); return 1; }
 }
diff --git a/gcc/testsuite/g++.old-deja/g++.law/arg5.C b/gcc/testsuite/g++.old-deja/g++.law/arg5.C
index 8db62856828..9c3c81cec90 100644
--- a/gcc/testsuite/g++.old-deja/g++.law/arg5.C
+++ b/gcc/testsuite/g++.old-deja/g++.law/arg5.C
@@ -10,7 +10,7 @@ extern "C" {
 int main()
 {
 	if (pow (2.0, 3.0) != 8.0)
-	  printf ("FAIL\n");
+	  { printf ("FAIL\n"); return 1; }
 	else
 	  printf ("PASS\n");
 }
diff --git a/gcc/testsuite/g++.old-deja/g++.law/arg7.C b/gcc/testsuite/g++.old-deja/g++.law/arg7.C
index 7ea89ec15fa..620be263770 100644
--- a/gcc/testsuite/g++.old-deja/g++.law/arg7.C
+++ b/gcc/testsuite/g++.old-deja/g++.law/arg7.C
@@ -9,8 +9,8 @@
 
 // Given the following overloaded function definitions
 
-void ovf(unsigned long, short,         short) { printf ("PASS\n"); }
-void ovf(          int, short, unsigned long) { printf ("FAIL\n"); }
+int ovf(unsigned long, short,         short) { printf ("PASS\n"); return 0; }
+int ovf(          int, short, unsigned long) { printf ("FAIL\n"); return 1; }
 
 // and the call
 //
@@ -28,6 +28,5 @@ int main(int, char**)
     unsigned int x = 0;
     unsigned int y = 0;
 
-    ovf(pixmap, x, y);
-    return 0;
+    return ovf(pixmap, x, y);
 }
diff --git a/gcc/testsuite/g++.old-deja/g++.law/arm4.C b/gcc/testsuite/g++.old-deja/g++.law/arm4.C
index 2fa43c3fc17..daadc593360 100644
--- a/gcc/testsuite/g++.old-deja/g++.law/arm4.C
+++ b/gcc/testsuite/g++.old-deja/g++.law/arm4.C
@@ -21,7 +21,7 @@ int main(void)
 
   S x(int (a));
   if (count > 0)
-    printf ("FAIL\n");
+    { printf ("FAIL\n"); return 1; }
   else
     printf ("PASS\n");
   return 0;
diff --git a/gcc/testsuite/g++.old-deja/g++.law/arm5.C b/gcc/testsuite/g++.old-deja/g++.law/arm5.C
index d39b476a840..de568aecf03 100644
--- a/gcc/testsuite/g++.old-deja/g++.law/arm5.C
+++ b/gcc/testsuite/g++.old-deja/g++.law/arm5.C
@@ -19,6 +19,6 @@ int main( void) {
         if (&c == &b)
                 printf( "PASS\n");
         else
-                printf( "FAIL\n");
+                { printf( "FAIL\n"); return 1; }
         return 0;
 }
diff --git a/gcc/testsuite/g++.old-deja/g++.law/arm7.C b/gcc/testsuite/g++.old-deja/g++.law/arm7.C
index 0ad9dddff7e..c767c597201 100644
--- a/gcc/testsuite/g++.old-deja/g++.law/arm7.C
+++ b/gcc/testsuite/g++.old-deja/g++.law/arm7.C
@@ -26,16 +26,15 @@ Derived::operator Base&() {
 	return *b;
 }
 
-void f(Base &b) {
+int f(Base &b) {
 	if (b.i == 99)
-	  printf ("PASS\n");
+	  { printf ("PASS\n"); return 0; }
 	else
-	  printf ("FAIL\n");
+	  { printf ("FAIL\n"); return 1; }
 }
 
 int main() {
 	Derived d(99);
-	f(d);
-	return 0;
+	return f(d);
 }
 
diff --git a/gcc/testsuite/g++.old-deja/g++.law/array1.C b/gcc/testsuite/g++.old-deja/g++.law/array1.C
index 13250c63420..d6fcdd5eb95 100644
--- a/gcc/testsuite/g++.old-deja/g++.law/array1.C
+++ b/gcc/testsuite/g++.old-deja/g++.law/array1.C
@@ -25,7 +25,7 @@ foo* foo::array = new foo [5];
 int main()
 {
   if (i != 5)
-    printf ("FAIL\n");
+    { printf ("FAIL\n"); return 1; }
   else
     printf ("PASS\n");
 }
diff --git a/gcc/testsuite/g++.old-deja/g++.law/bit-fields2.C b/gcc/testsuite/g++.old-deja/g++.law/bit-fields2.C
index beb34d05ba1..69fe85d8739 100644
--- a/gcc/testsuite/g++.old-deja/g++.law/bit-fields2.C
+++ b/gcc/testsuite/g++.old-deja/g++.law/bit-fields2.C
@@ -28,7 +28,7 @@ main(int argc, char **argv)
         struct foo bar;
 
 	if (offsetof (struct foo, c) > sizeof (unsigned int))
-		printf ("FAIL\n");
+		{ printf ("FAIL\n"); return 1; }
 	else
 		printf ("PASS\n");
 	return 0;
diff --git a/gcc/testsuite/g++.old-deja/g++.law/code-gen1.C b/gcc/testsuite/g++.old-deja/g++.law/code-gen1.C
index 0f7c6102164..a48ff84af05 100644
--- a/gcc/testsuite/g++.old-deja/g++.law/code-gen1.C
+++ b/gcc/testsuite/g++.old-deja/g++.law/code-gen1.C
@@ -14,7 +14,7 @@ int main()
   if (i == 2)
     printf ("PASS\n");
   else
-    printf ("FAIL\n");
+    { printf ("FAIL\n"); return 1; }
 }
 
 
diff --git a/gcc/testsuite/g++.old-deja/g++.law/code-gen5.C b/gcc/testsuite/g++.old-deja/g++.law/code-gen5.C
index 023b6237808..35087c0a51f 100644
--- a/gcc/testsuite/g++.old-deja/g++.law/code-gen5.C
+++ b/gcc/testsuite/g++.old-deja/g++.law/code-gen5.C
@@ -268,7 +268,7 @@ int main()
 	int i, j;
 
 	if (makeforms (cen,a,b) != 10)
-	  printf ("FAIL\n");
+	  { printf ("FAIL\n"); return 1; }
 	else
 	  printf ("PASS\n");
 
diff --git a/gcc/testsuite/g++.old-deja/g++.law/copy1.C b/gcc/testsuite/g++.old-deja/g++.law/copy1.C
index 5cea11ab38a..32dcbc69fc0 100644
--- a/gcc/testsuite/g++.old-deja/g++.law/copy1.C
+++ b/gcc/testsuite/g++.old-deja/g++.law/copy1.C
@@ -61,6 +61,6 @@ int main()
   if (pass)
     printf ("PASS\n");
   else
-    printf ("FAIL\n");
+    { printf ("FAIL\n"); return 1; }
 }
 
diff --git a/gcc/testsuite/g++.old-deja/g++.law/ctors12.C b/gcc/testsuite/g++.old-deja/g++.law/ctors12.C
index 32bf5c6ba90..403bf3fc42b 100644
--- a/gcc/testsuite/g++.old-deja/g++.law/ctors12.C
+++ b/gcc/testsuite/g++.old-deja/g++.law/ctors12.C
@@ -14,7 +14,7 @@ public:
         complex() { re=im=0; magic=MAGIC; }
         complex(double d) { re=d; im=0; magic=MAGIC; }
         complex(double d, double d2) {re=d; im=d2; magic=MAGIC; }
-        ~complex() {if(magic!=MAGIC) {printf("FAIL\n");exit(0);}}
+        ~complex() {if(magic!=MAGIC) {printf("FAIL\n");exit(1);}}
         friend ostream& operator << (ostream& o, const complex& c)
                 { return o << "(" << c.re << "," << c.im << ")"; }
 };
diff --git a/gcc/testsuite/g++.old-deja/g++.law/ctors16.C b/gcc/testsuite/g++.old-deja/g++.law/ctors16.C
index 8a3982b15e0..ede755af1b1 100644
--- a/gcc/testsuite/g++.old-deja/g++.law/ctors16.C
+++ b/gcc/testsuite/g++.old-deja/g++.law/ctors16.C
@@ -43,7 +43,7 @@ int main() {
     D d;
     E e;
     if (strncmp ("ABCABDABE", stuff, 9))
-	printf ("FAIL\n");
+	{ printf ("FAIL\n"); return 1; }
     else
 	printf ("PASS\n");
 }
diff --git a/gcc/testsuite/g++.old-deja/g++.law/ctors2.C b/gcc/testsuite/g++.old-deja/g++.law/ctors2.C
index d4f2d9cdabb..68c004d7586 100644
--- a/gcc/testsuite/g++.old-deja/g++.law/ctors2.C
+++ b/gcc/testsuite/g++.old-deja/g++.law/ctors2.C
@@ -63,7 +63,7 @@ int main() {
       || strcmp (Sig::sigTable[3].Magic, "FLOA")
       || strcmp (Sig::sigTable[4].Magic, "DOUB")
       || strcmp (Sig::sigTable[5].Magic, "COMP"))
-    printf ("FAIL\n");
+    { printf ("FAIL\n"); return 1; }
   else
     printf ("PASS\n");
 }
diff --git a/gcc/testsuite/g++.old-deja/g++.law/ctors8.C b/gcc/testsuite/g++.old-deja/g++.law/ctors8.C
index ef40d354b69..577394e4d3d 100644
--- a/gcc/testsuite/g++.old-deja/g++.law/ctors8.C
+++ b/gcc/testsuite/g++.old-deja/g++.law/ctors8.C
@@ -20,5 +20,5 @@ int main()
       && arr[1].index == -1)
     printf ("PASS\n");
   else
-    printf ("FAIL\n");
+    { printf ("FAIL\n"); return 1; }
 }
diff --git a/gcc/testsuite/g++.old-deja/g++.law/cvt12.C b/gcc/testsuite/g++.old-deja/g++.law/cvt12.C
index 5ea83dbbee1..8455fac8b2b 100644
--- a/gcc/testsuite/g++.old-deja/g++.law/cvt12.C
+++ b/gcc/testsuite/g++.old-deja/g++.law/cvt12.C
@@ -25,5 +25,5 @@ int main()
    if (x == 5 && y == 5)
      printf ("PASS\n");
    else
-     printf ("FAIL\n");
+     { printf ("FAIL\n"); return 1; }
 }
diff --git a/gcc/testsuite/g++.old-deja/g++.law/cvt2.C b/gcc/testsuite/g++.old-deja/g++.law/cvt2.C
index 7d3e03453e0..c37098536e9 100644
--- a/gcc/testsuite/g++.old-deja/g++.law/cvt2.C
+++ b/gcc/testsuite/g++.old-deja/g++.law/cvt2.C
@@ -27,7 +27,10 @@ A(const char* s)
         // s still ok here
         ifstream inf(s);
 	if (strncmp ("aaa", s, 3))
-	  printf ("FAIL\n");
+	  {
+	    printf ("FAIL\n");
+	    exit (1);
+	  }
 	else
 	  printf ("PASS\n");
 }
diff --git a/gcc/testsuite/g++.old-deja/g++.law/cvt7.C b/gcc/testsuite/g++.old-deja/g++.law/cvt7.C
index c9cc1b5cd6d..99fe2555446 100644
--- a/gcc/testsuite/g++.old-deja/g++.law/cvt7.C
+++ b/gcc/testsuite/g++.old-deja/g++.law/cvt7.C
@@ -61,7 +61,7 @@ int main()
 	printf ("PASS\n");
         break;
     default:
-	printf ("FAIL\n");
+	{ printf ("FAIL\n"); return 1; }
     }
 
     B b(a);
diff --git a/gcc/testsuite/g++.old-deja/g++.law/dtors3.C b/gcc/testsuite/g++.old-deja/g++.law/dtors3.C
index 7ed92fcedb9..dc856761fb4 100644
--- a/gcc/testsuite/g++.old-deja/g++.law/dtors3.C
+++ b/gcc/testsuite/g++.old-deja/g++.law/dtors3.C
@@ -23,7 +23,7 @@ public:
     if (killed)
       {
 	printf ("FAIL\n");
-	exit (0);
+	exit (1);
       }
     return *this;
   }
diff --git a/gcc/testsuite/g++.old-deja/g++.law/dtors5.C b/gcc/testsuite/g++.old-deja/g++.law/dtors5.C
index 3c54561501e..0628041751c 100644
--- a/gcc/testsuite/g++.old-deja/g++.law/dtors5.C
+++ b/gcc/testsuite/g++.old-deja/g++.law/dtors5.C
@@ -29,5 +29,5 @@ int main() {
    if (things == 0)
      printf ("PASS\n");
    else
-     printf ("FAIL\n");
+     { printf ("FAIL\n"); return 1; }
 }
diff --git a/gcc/testsuite/g++.old-deja/g++.law/enum9.C b/gcc/testsuite/g++.old-deja/g++.law/enum9.C
index 0a3531e1f3b..9bc9f50c9aa 100644
--- a/gcc/testsuite/g++.old-deja/g++.law/enum9.C
+++ b/gcc/testsuite/g++.old-deja/g++.law/enum9.C
@@ -7,7 +7,7 @@
   main()
   {
     if (sizeof (E) != 4)
-	printf ("FAIL\n");
+	{ printf ("FAIL\n"); return 1; }
     else
 	printf ("PASS\n");
     return 0;
diff --git a/gcc/testsuite/g++.old-deja/g++.law/global-init1.C b/gcc/testsuite/g++.old-deja/g++.law/global-init1.C
index 17dc9c5cdf1..5807b1913a5 100644
--- a/gcc/testsuite/g++.old-deja/g++.law/global-init1.C
+++ b/gcc/testsuite/g++.old-deja/g++.law/global-init1.C
@@ -14,7 +14,7 @@ int main ()
 {
   S * cls = the_s ();
   if (cls->a != 6)
-    printf ("FAIL\n");
+    { printf ("FAIL\n"); return 1; }
   else
     printf ("PASS\n");
 }
diff --git a/gcc/testsuite/g++.old-deja/g++.law/init11.C b/gcc/testsuite/g++.old-deja/g++.law/init11.C
index a6d6f01487d..3b3092f096c 100644
--- a/gcc/testsuite/g++.old-deja/g++.law/init11.C
+++ b/gcc/testsuite/g++.old-deja/g++.law/init11.C
@@ -20,5 +20,5 @@ int main()
   if (Ack.a == 5 && Ack.b == 7 && Ack.c == 3)
     printf ("PASS\n");
   else
-    printf ("FAIL\n");
+    { printf ("FAIL\n"); return 1; }
 }
diff --git a/gcc/testsuite/g++.old-deja/g++.law/init14.C b/gcc/testsuite/g++.old-deja/g++.law/init14.C
index 3a9e3e1369f..6c15925c461 100644
--- a/gcc/testsuite/g++.old-deja/g++.law/init14.C
+++ b/gcc/testsuite/g++.old-deja/g++.law/init14.C
@@ -20,7 +20,7 @@ int main()
     if (Ack.a != 5
 	|| Ack.b != 7
 	|| Ack.c != 3)
-      printf ("FAIL\n");
+      { printf ("FAIL\n"); return 1; }
     else
       printf ("PASS\n");
 }
diff --git a/gcc/testsuite/g++.old-deja/g++.law/init9.C b/gcc/testsuite/g++.old-deja/g++.law/init9.C
index 9806965f337..823bc61187b 100644
--- a/gcc/testsuite/g++.old-deja/g++.law/init9.C
+++ b/gcc/testsuite/g++.old-deja/g++.law/init9.C
@@ -29,7 +29,7 @@ int main() {
 	    && ob[3][0].get_a() == 7 && ob[3][1].get_a() == 8)
 	  printf ("PASS\n");
 	else
-	  printf ("FAIL\n");
+	  { printf ("FAIL\n"); return 1; }
 
         return 0;
 }
diff --git a/gcc/testsuite/g++.old-deja/g++.law/operators15.C b/gcc/testsuite/g++.old-deja/g++.law/operators15.C
index 0b0623c94c5..94775c51217 100644
--- a/gcc/testsuite/g++.old-deja/g++.law/operators15.C
+++ b/gcc/testsuite/g++.old-deja/g++.law/operators15.C
@@ -20,7 +20,7 @@ int main(void)
   ::delete ps1;             // Wrong T::operator delete() is called here
 
   if (delete_counter != -1)
-    printf ("FAIL\n");
+    { printf ("FAIL\n"); return 1; }
   else
     printf ("PASS\n");
   return 0;
diff --git a/gcc/testsuite/g++.old-deja/g++.law/operators16.C b/gcc/testsuite/g++.old-deja/g++.law/operators16.C
index e4c176f0912..76fcb640eaf 100644
--- a/gcc/testsuite/g++.old-deja/g++.law/operators16.C
+++ b/gcc/testsuite/g++.old-deja/g++.law/operators16.C
@@ -25,5 +25,5 @@ int main(void)
 	if (pass)
 		printf ("PASS\n");
 	else
-		printf ("FAIL\n");
+		{ printf ("FAIL\n"); return 1; }
 }
diff --git a/gcc/testsuite/g++.old-deja/g++.law/operators27.C b/gcc/testsuite/g++.old-deja/g++.law/operators27.C
index 6a07176ba3a..970e9344b6b 100644
--- a/gcc/testsuite/g++.old-deja/g++.law/operators27.C
+++ b/gcc/testsuite/g++.old-deja/g++.law/operators27.C
@@ -26,7 +26,7 @@ int main(void)
 {
     K * pK = new (std::nothrow) K( 10);
     if ( FLAG != 1 )
-	printf ("FAIL\n");
+	{ printf ("FAIL\n"); return 1; }
     else
 	printf ("PASS\n");
     return 0;
diff --git a/gcc/testsuite/g++.old-deja/g++.law/operators30.C b/gcc/testsuite/g++.old-deja/g++.law/operators30.C
index 4236dc519a8..26ad6988e38 100644
--- a/gcc/testsuite/g++.old-deja/g++.law/operators30.C
+++ b/gcc/testsuite/g++.old-deja/g++.law/operators30.C
@@ -21,5 +21,5 @@ int main ()
 	if (a == 0)
 		printf("PASS\n");
 	else
-		printf("FAIL\n");
+		{ printf("FAIL\n"); return 1; }
 }
diff --git a/gcc/testsuite/g++.old-deja/g++.law/operators8.C b/gcc/testsuite/g++.old-deja/g++.law/operators8.C
index 5fd94bdd685..f1a1236a599 100644
--- a/gcc/testsuite/g++.old-deja/g++.law/operators8.C
+++ b/gcc/testsuite/g++.old-deja/g++.law/operators8.C
@@ -3,7 +3,7 @@
 
 class shape {
   public:
-    virtual void vDisplay(void) const = 0;
+    virtual int vDisplay(void) const = 0;
   protected:
     int X;
     int Y;
@@ -16,8 +16,9 @@ class square :public shape {
 	Y = y;
 	width = width_;
     }
-    void vDisplay(void) const {
+    int vDisplay(void) const {
 	printf ("PASS\n");
+	return 0;
     }
   protected:
     int width;
@@ -32,8 +33,9 @@ class triangle :public shape {
 	width = width_;
 	height = height_;
     }
-    void vDisplay(void) const {
+    int vDisplay(void) const {
 	printf ("FAIL\n");
+	return 1;
     }
   protected:
     int width;
@@ -44,6 +46,6 @@ int main() {
     shape* s1 = new square(4,4,5);
     shape* s2 = new triangle(6,6,2,3);
     *s1 = *s2;
-    s1->vDisplay();
+    return s1->vDisplay();
 }
 
diff --git a/gcc/testsuite/g++.old-deja/g++.law/patches1.C b/gcc/testsuite/g++.old-deja/g++.law/patches1.C
index 3ec9321c336..3108e26cce9 100644
--- a/gcc/testsuite/g++.old-deja/g++.law/patches1.C
+++ b/gcc/testsuite/g++.old-deja/g++.law/patches1.C
@@ -18,7 +18,7 @@ int main()
       if (type(0.0) != 2)
               ++i;
       if (i > 0)
-	printf ("FAIL\n");
+	{ printf ("FAIL\n"); return 1; }
       else
 	printf ("PASS\n");
 }
diff --git a/gcc/testsuite/g++.old-deja/g++.law/refs1.C b/gcc/testsuite/g++.old-deja/g++.law/refs1.C
index 0efe9db3ff4..d53cdb41706 100644
--- a/gcc/testsuite/g++.old-deja/g++.law/refs1.C
+++ b/gcc/testsuite/g++.old-deja/g++.law/refs1.C
@@ -38,5 +38,5 @@ int main() {
    if (i == 3)
      printf ("PASS\n");
    else
-     printf ("FAIL\n");
+     { printf ("FAIL\n"); return 1; }
 }
diff --git a/gcc/testsuite/g++.old-deja/g++.law/scope2.C b/gcc/testsuite/g++.old-deja/g++.law/scope2.C
index bfefb61fc45..d216f4da1b5 100644
--- a/gcc/testsuite/g++.old-deja/g++.law/scope2.C
+++ b/gcc/testsuite/g++.old-deja/g++.law/scope2.C
@@ -40,5 +40,5 @@ int main ()
   if (overloaded_delete == 1)
     printf ("PASS\n");
   else
-    printf ("FAIL\n");
+    { printf ("FAIL\n"); return 1; }
 }
diff --git a/gcc/testsuite/g++.old-deja/g++.law/temps2.C b/gcc/testsuite/g++.old-deja/g++.law/temps2.C
index 4e216720c7b..5fe49e9c072 100644
--- a/gcc/testsuite/g++.old-deja/g++.law/temps2.C
+++ b/gcc/testsuite/g++.old-deja/g++.law/temps2.C
@@ -48,7 +48,7 @@ int main()
     // method() returns a reference to the same object.
     f1().method().method();
     if (fail)
-      printf ("FAIL\n");
+      { printf ("FAIL\n"); return 1; }
     else
       printf ("PASS\n");
 }
diff --git a/gcc/testsuite/g++.old-deja/g++.law/temps5.C b/gcc/testsuite/g++.old-deja/g++.law/temps5.C
index 7c591a409e9..4d8b596b911 100644
--- a/gcc/testsuite/g++.old-deja/g++.law/temps5.C
+++ b/gcc/testsuite/g++.old-deja/g++.law/temps5.C
@@ -35,7 +35,7 @@ int
 main(void)
 {
 	if (f (2).val != 5)
-		printf ("FAIL\n");
+		{ printf ("FAIL\n"); return 1; }
 	else
 		printf ("PASS\n");
 }
diff --git a/gcc/testsuite/g++.old-deja/g++.law/temps6.C b/gcc/testsuite/g++.old-deja/g++.law/temps6.C
index 7d2952a0c83..5290df072c3 100644
--- a/gcc/testsuite/g++.old-deja/g++.law/temps6.C
+++ b/gcc/testsuite/g++.old-deja/g++.law/temps6.C
@@ -18,7 +18,7 @@ int main()
 {
   test(&xxx, &str::i) = 5;
   if (xxx.i == 0)
-    printf ("FAIL\n");
+    { printf ("FAIL\n"); return 1; }
   else
     printf ("PASS\n");
 }
diff --git a/gcc/testsuite/g++.old-deja/g++.law/virtual4.C b/gcc/testsuite/g++.old-deja/g++.law/virtual4.C
index 47af3aa9de9..0254fda6ab9 100644
--- a/gcc/testsuite/g++.old-deja/g++.law/virtual4.C
+++ b/gcc/testsuite/g++.old-deja/g++.law/virtual4.C
@@ -13,7 +13,7 @@ class A
 class B:public A
 {
   public:
-    void SetProp() { if (!aset) { printf ("FAIL\n"); exit (0);} aset--;}
+    void SetProp() { if (!aset) { printf ("FAIL\n"); exit (1);} aset--;}
 };
 
 int main()
-- 
2.30.2