Patchwork [testsuite] fix g++.dg/cpp0x/nullptr21.C to be self-checking

login
register
mail settings
Submitter Janis Johnson
Date July 25, 2012, 10:11 p.m.
Message ID <50106F17.4010504@mentor.com>
Download mbox | patch
Permalink /patch/173297/
State New
Headers show

Comments

Janis Johnson - July 25, 2012, 10:11 p.m.
This patch changes test g++.dg/cpp0x/nullptr21.C to be self-checking
instead of examining printf output via dg-output.  Now it can be run
reliably on bare-metal platforms.  I couldn't see any indication in the
test itself or in the gcc-patches archives to show that the printfs
were significant.

Checked in on mainline, coming soon to 4.7.

Janis
2012-07-25  Janis Johnson  <janisjo@codesourcery.com>

	*  g++.dg/cpp0x/nullptr21.c: Remove printfs, make self-checking.

Patch

Index: gcc/testsuite/g++.dg/cpp0x/nullptr21.C
===================================================================
--- gcc/testsuite/g++.dg/cpp0x/nullptr21.C	(revision 189856)
+++ gcc/testsuite/g++.dg/cpp0x/nullptr21.C	(working copy)
@@ -3,42 +3,53 @@ 
 
 // Test throw and catch
 
-#include <cstdio>
+extern "C" void abort (void);
 
 typedef decltype(nullptr) nullptr_t;
 
+int result[2];
+
+void __attribute__((noinline))
+foo (int i, int j)
+{
+  result[i] = j;
+}
+
 int main()
 {
   try {
     throw nullptr;
   } catch (void*) {
-    printf("Test 1 Fail");
+    foo (0, 1);
   } catch (bool) {
-    printf("Test 1 Fail");
+    foo (0, 2);
   } catch (int) {
-    printf("Test 1 Fail");
+    foo (0, 3);
   } catch (long int) {
-    printf("Test 1 Fail");
+    foo (0, 4);
   } catch (nullptr_t) {
-    printf("Test 1 OK");
+    foo (0, 5);
   } catch (...) {
-    printf("Test 1 Fail");
-  }  // { dg-output "Test 1 OK" }
+    foo (0, 6);
+  }
 
   nullptr_t mynull = 0;
   try {
     throw mynull;
   } catch (void*) {
-    printf("Test 2 Fail");
+    foo (1, 1);
   } catch (bool) {
-    printf("Test 2 Fail");
+    foo (1, 2);
   } catch (int) {
-    printf("Test 2 Fail");
+    foo (1, 3);
   } catch (long int) {
-    printf("Test 2 Fail");
+    foo (1, 4);
   } catch (nullptr_t) {
-    printf("Test 2 OK");
+    foo (1, 5);
   } catch (...) {
-    printf("Test 2 Fail");
-  }  // { dg-output "Test 2 OK" }
+    foo (1, 6);
+  }
+
+  if (result[0] != 5 || result[1] != 5)
+    abort ();
 }