diff options
author | Louis Dionne <ldionne@apple.com> | 2019-04-02 22:21:27 +0000 |
---|---|---|
committer | Louis Dionne <ldionne@apple.com> | 2019-04-02 22:21:27 +0000 |
commit | 38b7e74836e314ec15c16d9106d2e2cf295e349a (patch) | |
tree | 6cbd91c5f2eb570bb694c064936b4af4e8fa3d7d /libcxx/test/std/strings/basic.string/string.nonmembers/string.io/get_line.pass.cpp | |
parent | cc525c97b7df198095124ee1fb68219e5a9189a5 (diff) | |
download | bcm5719-llvm-38b7e74836e314ec15c16d9106d2e2cf295e349a.tar.gz bcm5719-llvm-38b7e74836e314ec15c16d9106d2e2cf295e349a.zip |
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
Diffstat (limited to 'libcxx/test/std/strings/basic.string/string.nonmembers/string.io/get_line.pass.cpp')
-rw-r--r-- | libcxx/test/std/strings/basic.string/string.nonmembers/string.io/get_line.pass.cpp | 82 |
1 files changed, 1 insertions, 81 deletions
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; } |