From 38b7e74836e314ec15c16d9106d2e2cf295e349a Mon Sep 17 00:00:00 2001
From: Louis Dionne <ldionne@apple.com>
Date: Tue, 2 Apr 2019 22:21:27 +0000
Subject: Revert "[libc++] Fix error flags and exceptions propagated from input
 stream operations"

This reverts commits r357533 and r357531, which broke the LLDB
data formatters. I'll hold off until we know how to fix the data
formatters accordingly.

llvm-svn: 357536
---
 .../string.nonmembers/string.io/get_line.pass.cpp  | 82 +---------------------
 .../string.io/get_line_delim.pass.cpp              | 81 +--------------------
 .../string.io/stream_extract.pass.cpp              | 39 ----------
 3 files changed, 2 insertions(+), 200 deletions(-)

(limited to 'libcxx/test/std/strings')

diff --git a/libcxx/test/std/strings/basic.string/string.nonmembers/string.io/get_line.pass.cpp b/libcxx/test/std/strings/basic.string/string.nonmembers/string.io/get_line.pass.cpp
index 6069f8e377e..8e663cb4f60 100644
--- a/libcxx/test/std/strings/basic.string/string.nonmembers/string.io/get_line.pass.cpp
+++ b/libcxx/test/std/strings/basic.string/string.nonmembers/string.io/get_line.pass.cpp
@@ -18,7 +18,6 @@
 #include <cassert>
 
 #include "min_allocator.h"
-#include "test_macros.h"
 
 int main(int, char**)
 {
@@ -78,85 +77,6 @@ int main(int, char**)
         assert(s == L"   ghij");
     }
 #endif
-#ifndef TEST_HAS_NO_EXCEPTIONS
-    {
-        std::basic_stringbuf<char> sb("hello");
-        std::basic_istream<char> is(&sb);
-        is.exceptions(std::ios_base::eofbit);
-
-        std::basic_string<char> s;
-        bool threw = false;
-        try {
-            std::getline(is, s);
-        } catch (std::ios::failure const&) {
-            threw = true;
-        }
-
-        assert(!is.bad());
-        assert(!is.fail());
-        assert( is.eof());
-        assert(threw);
-        assert(s == "hello");
-    }
-    {
-        std::basic_stringbuf<wchar_t> sb(L"hello");
-        std::basic_istream<wchar_t> is(&sb);
-        is.exceptions(std::ios_base::eofbit);
-
-        std::basic_string<wchar_t> s;
-        bool threw = false;
-        try {
-            std::getline(is, s);
-        } catch (std::ios::failure const&) {
-            threw = true;
-        }
-
-        assert(!is.bad());
-        assert(!is.fail());
-        assert( is.eof());
-        assert(threw);
-        assert(s == L"hello");
-    }
-
-    {
-        std::basic_stringbuf<char> sb;
-        std::basic_istream<char> is(&sb);
-        is.exceptions(std::ios_base::failbit);
-
-        std::basic_string<char> s;
-        bool threw = false;
-        try {
-            std::getline(is, s);
-        } catch (std::ios::failure const&) {
-            threw = true;
-        }
-
-        assert(!is.bad());
-        assert( is.fail());
-        assert( is.eof());
-        assert(threw);
-        assert(s == "");
-    }
-    {
-        std::basic_stringbuf<wchar_t> sb;
-        std::basic_istream<wchar_t> is(&sb);
-        is.exceptions(std::ios_base::failbit);
-
-        std::basic_string<wchar_t> s;
-        bool threw = false;
-        try {
-            std::getline(is, s);
-        } catch (std::ios::failure const&) {
-            threw = true;
-        }
-
-        assert(!is.bad());
-        assert( is.fail());
-        assert( is.eof());
-        assert(threw);
-        assert(s == L"");
-    }
-#endif // TEST_HAS_NO_EXCEPTIONS
 
-    return 0;
+  return 0;
 }
diff --git a/libcxx/test/std/strings/basic.string/string.nonmembers/string.io/get_line_delim.pass.cpp b/libcxx/test/std/strings/basic.string/string.nonmembers/string.io/get_line_delim.pass.cpp
index d7d271bf02c..b081b55c920 100644
--- a/libcxx/test/std/strings/basic.string/string.nonmembers/string.io/get_line_delim.pass.cpp
+++ b/libcxx/test/std/strings/basic.string/string.nonmembers/string.io/get_line_delim.pass.cpp
@@ -18,7 +18,6 @@
 #include <cassert>
 
 #include "min_allocator.h"
-#include "test_macros.h"
 
 int main(int, char**)
 {
@@ -90,84 +89,6 @@ int main(int, char**)
         assert(s == L"   ghij");
     }
 #endif
-#ifndef TEST_HAS_NO_EXCEPTIONS
-    {
-        std::basic_stringbuf<char> sb("hello");
-        std::basic_istream<char> is(&sb);
-        is.exceptions(std::ios::eofbit);
-
-        std::basic_string<char> s;
-        bool threw = false;
-        try {
-            std::getline(is, s, '\n');
-        } catch (std::ios::failure const&) {
-            threw = true;
-        }
-
-        assert(!is.bad());
-        assert(!is.fail());
-        assert( is.eof());
-        assert(threw);
-        assert(s == "hello");
-    }
-    {
-        std::basic_stringbuf<wchar_t> sb(L"hello");
-        std::basic_istream<wchar_t> is(&sb);
-        is.exceptions(std::ios::eofbit);
-
-        std::basic_string<wchar_t> s;
-        bool threw = false;
-        try {
-            std::getline(is, s, L'\n');
-        } catch (std::ios::failure const&) {
-            threw = true;
-        }
-
-        assert(!is.bad());
-        assert(!is.fail());
-        assert( is.eof());
-        assert(threw);
-        assert(s == L"hello");
-    }
-    {
-        std::basic_stringbuf<char> sb;
-        std::basic_istream<char> is(&sb);
-        is.exceptions(std::ios::failbit);
-
-        std::basic_string<char> s;
-        bool threw = false;
-        try {
-            std::getline(is, s, '\n');
-        } catch (std::ios::failure const&) {
-            threw = true;
-        }
-
-        assert(!is.bad());
-        assert( is.fail());
-        assert( is.eof());
-        assert(threw);
-        assert(s == "");
-    }
-    {
-        std::basic_stringbuf<wchar_t> sb;
-        std::basic_istream<wchar_t> is(&sb);
-        is.exceptions(std::ios::failbit);
-
-        std::basic_string<wchar_t> s;
-        bool threw = false;
-        try {
-            std::getline(is, s, L'\n');
-        } catch (std::ios::failure const&) {
-            threw = true;
-        }
-
-        assert(!is.bad());
-        assert( is.fail());
-        assert( is.eof());
-        assert(threw);
-        assert(s == L"");
-    }
-#endif // TEST_HAS_NO_EXCEPTIONS
 
-    return 0;
+  return 0;
 }
diff --git a/libcxx/test/std/strings/basic.string/string.nonmembers/string.io/stream_extract.pass.cpp b/libcxx/test/std/strings/basic.string/string.nonmembers/string.io/stream_extract.pass.cpp
index 92061e2c476..389701d1d51 100644
--- a/libcxx/test/std/strings/basic.string/string.nonmembers/string.io/stream_extract.pass.cpp
+++ b/libcxx/test/std/strings/basic.string/string.nonmembers/string.io/stream_extract.pass.cpp
@@ -18,7 +18,6 @@
 #include <cassert>
 
 #include "min_allocator.h"
-#include "test_macros.h"
 
 int main(int, char**)
 {
@@ -66,44 +65,6 @@ int main(int, char**)
         in >> s;
         assert(in.fail());
     }
-#ifndef TEST_HAS_NO_EXCEPTIONS
-    {
-        std::stringbuf sb;
-        std::istream is(&sb);
-        is.exceptions(std::ios::failbit);
-
-        bool threw = false;
-        try {
-            std::string s;
-            is >> s;
-        } catch (std::ios::failure const&) {
-            threw = true;
-        }
-
-        assert(!is.bad());
-        assert(is.fail());
-        assert(is.eof());
-        assert(threw);
-    }
-    {
-        std::stringbuf sb;
-        std::istream is(&sb);
-        is.exceptions(std::ios::eofbit);
-
-        bool threw = false;
-        try {
-            std::string s;
-            is >> s;
-        } catch (std::ios::failure const&) {
-            threw = true;
-        }
-
-        assert(!is.bad());
-        assert(is.fail());
-        assert(is.eof());
-        assert(threw);
-    }
-#endif // TEST_HAS_NO_EXCEPTIONS
 #if TEST_STD_VER >= 11
     {
         typedef std::basic_string<char, std::char_traits<char>, min_allocator<char>> S;
-- 
cgit v1.2.3