Revert "Update aosp/master libcxx rebase to r263688"

The world is burning. This reverts commit c004fd909c, reversing changes made to 1418e4163d.
2016-05-25 22:36:09 -07:00
parent c004fd909c
commit 1d4a1edbc7
1396 changed files with 11495 additions and 38952 deletions
--- a/test/std/re/re.regex/re.regex.construct/awk_oct.pass.cpp
+++ b/test/std/re/re.regex/re.regex.construct/awk_oct.pass.cpp
@@ -16,7 +16,6 @@

 #include <regex>
 #include <cassert>
-#include "test_macros.h"

 int main() 
 {
--- a/test/std/re/re.regex/re.regex.construct/bad_escape.pass.cpp
+++ b/test/std/re/re.regex/re.regex.construct/bad_escape.pass.cpp
@@ -7,7 +7,6 @@
 //
 //===----------------------------------------------------------------------===//

-// XFAIL: libcpp-no-exceptions
 // <regex>

 // template <class charT, class traits = regex_traits<charT>> class basic_regex;
@@ -17,7 +16,6 @@

 #include <regex>
 #include <cassert>
-#include "test_macros.h"

 static bool error_escape_thrown(const char *pat) 
 {
@@ -34,7 +32,6 @@ int main()
 {
    assert(error_escape_thrown("[\\a]"));
    assert(error_escape_thrown("\\a"));
-    assert(error_escape_thrown("\\"));

    assert(error_escape_thrown("[\\e]"));
    assert(error_escape_thrown("\\e"));
--- a/test/std/re/re.regex/re.regex.construct/bad_repeat.pass.cpp
+++ b/test/std/re/re.regex/re.regex.construct/bad_repeat.pass.cpp
@@ -7,7 +7,6 @@
 //
 //===----------------------------------------------------------------------===//

-// XFAIL: libcpp-no-exceptions
 // <regex>

 // template <class charT, class traits = regex_traits<charT>> class basic_regex;
@@ -17,7 +16,6 @@

 #include <regex>
 #include <cassert>
-#include "test_macros.h"

 static bool error_badrepeat_thrown(const char *pat) 
 {
--- a/test/std/re/re.regex/re.regex.construct/copy.pass.cpp
+++ b/test/std/re/re.regex/re.regex.construct/copy.pass.cpp
@@ -15,7 +15,6 @@

 #include <regex>
 #include <cassert>
-#include "test_macros.h"

 int main()
 {
--- a/test/std/re/re.regex/re.regex.construct/default.pass.cpp
+++ b/test/std/re/re.regex/re.regex.construct/default.pass.cpp
@@ -15,7 +15,6 @@

 #include <regex>
 #include <cassert>
-#include "test_macros.h"

 template <class CharT>
 void
--- a/test/std/re/re.regex/re.regex.construct/il_flg.pass.cpp
+++ b/test/std/re/re.regex/re.regex.construct/il_flg.pass.cpp
@@ -16,7 +16,6 @@

 #include <regex>
 #include <cassert>
-#include "test_macros.h"

 #ifndef _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS

--- a/test/std/re/re.regex/re.regex.construct/iter_iter.pass.cpp
+++ b/test/std/re/re.regex/re.regex.construct/iter_iter.pass.cpp
@@ -18,7 +18,6 @@
 #include <cassert>

 #include "test_iterators.h"
-#include "test_macros.h"

 template <class Iter>
 void
--- a/test/std/re/re.regex/re.regex.construct/iter_iter_flg.pass.cpp
+++ b/test/std/re/re.regex/re.regex.construct/iter_iter_flg.pass.cpp
@@ -19,7 +19,6 @@
 #include <cassert>

 #include "test_iterators.h"
-#include "test_macros.h"

 template <class Iter>
 void
--- a/test/std/re/re.regex/re.regex.construct/ptr.pass.cpp
+++ b/test/std/re/re.regex/re.regex.construct/ptr.pass.cpp
@@ -15,7 +15,6 @@

 #include <regex>
 #include <cassert>
-#include "test_macros.h"

 template <class CharT>
 void
--- a/test/std/re/re.regex/re.regex.construct/ptr_flg.pass.cpp
+++ b/test/std/re/re.regex/re.regex.construct/ptr_flg.pass.cpp
@@ -15,7 +15,6 @@

 #include <regex>
 #include <cassert>
-#include "test_macros.h"

 template <class CharT>
 void
--- a/test/std/re/re.regex/re.regex.construct/ptr_size_flg.pass.cpp
+++ b/test/std/re/re.regex/re.regex.construct/ptr_size_flg.pass.cpp
@@ -15,7 +15,6 @@

 #include <regex>
 #include <cassert>
-#include "test_macros.h"

 template <class CharT>
 void
--- a/test/std/re/re.regex/re.regex.construct/string.pass.cpp
+++ b/test/std/re/re.regex/re.regex.construct/string.pass.cpp
@@ -16,7 +16,6 @@

 #include <regex>
 #include <cassert>
-#include "test_macros.h"

 template <class String>
 void
--- a/test/std/re/re.regex/re.regex.construct/string_flg.pass.cpp
+++ b/test/std/re/re.regex/re.regex.construct/string_flg.pass.cpp
@@ -17,7 +17,6 @@

 #include <regex>
 #include <cassert>
-#include "test_macros.h"

 template <class String>
 void