Protect std::ostream::sentry test under libcpp-no-exceptions

Roger Ferrer Ibanez · Roger Ferrer Ibanez · commit 9f1bcb65aa91 · 2016-12-01T17:31:38.000Z
Skip test that throws an exception. Differential Revision: https://reviews.llvm.org/D27255 llvm-svn: 288378
diff --git a/libcxx/test/std/input.output/iostream.format/output.streams/ostream_sentry/destruct.pass.cpp b/libcxx/test/std/input.output/iostream.format/output.streams/ostream_sentry/destruct.pass.cpp
@@ -7,7 +7,6 @@
 //
 //===----------------------------------------------------------------------===//
 
-// XFAIL: libcpp-no-exceptions
 // <ostream>
 
 // template <class charT, class traits = char_traits<charT> >
@@ -18,6 +17,8 @@
 #include <ostream>
 #include <cassert>
 
+#include "test_macros.h"
+
 int sync_called = 0;
 
 template <class CharT>
@@ -58,6 +59,7 @@ int main()
         unitbuf(os);
     }
     assert(sync_called == 1);
+#ifndef TEST_HAS_NO_EXCEPTIONS
     {
         testbuf1<char> sb;
         std::ostream os(&sb);
@@ -73,4 +75,5 @@ int main()
         }
         assert(sync_called == 1);
     }
+#endif
 }

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,6 @@`
`7`	`7`	`//`
`8`	`8`	`//===----------------------------------------------------------------------===//`
`9`	`9`
`10`		`-// XFAIL: libcpp-no-exceptions`
`11`	`10`	`// <ostream>`
`12`	`11`
`13`	`12`	`// template <class charT, class traits = char_traits<charT> >`
`@@ -18,6 +17,8 @@`
`18`	`17`	`#include <ostream>`
`19`	`18`	`#include <cassert>`
`20`	`19`
	`20`	`+#include "test_macros.h"`
	`21`	`+`
`21`	`22`	`int sync_called = 0;`
`22`	`23`
`23`	`24`	`template <class CharT>`
`@@ -58,6 +59,7 @@ int main()`
`58`	`59`	`unitbuf(os);`
`59`	`60`	`}`
`60`	`61`	`assert(sync_called == 1);`
	`62`	`+#ifndef TEST_HAS_NO_EXCEPTIONS`
`61`	`63`	`{`
`62`	`64`	`testbuf1<char> sb;`
`63`	`65`	`std::ostream os(&sb);`
`@@ -73,4 +75,5 @@ int main()`
`73`	`75`	`}`
`74`	`76`	`assert(sync_called == 1);`
`75`	`77`	`}`
	`78`	`+#endif`
`76`	`79`	`}`