Author: hans Date: Tue Jan 26 18:07:27 2016 New Revision: 258887 URL: http://llvm.org/viewvc/llvm-project?rev=258887&view=rev Log: Merging r258403: ------------------------------------------------------------------------ r258403 | dsanders | 2016-01-21 07:35:15 -0800 (Thu, 21 Jan 2016) | 7 lines
[libcxx] Add appropriate 'REQUIRE' directives to tests that require en_US.UTF-8. Reviewers: mclow.lists, hans Subscribers: bcraig, cfe-commits Differential Revision: http://reviews.llvm.org/D16406 ------------------------------------------------------------------------ Modified: libcxx/branches/release_38/ (props changed) libcxx/branches/release_38/test/std/input.output/file.streams/fstreams/filebuf.virtuals/overflow.pass.cpp libcxx/branches/release_38/test/std/input.output/file.streams/fstreams/filebuf.virtuals/underflow.pass.cpp libcxx/branches/release_38/test/std/input.output/iostream.format/ext.manip/get_time.pass.cpp libcxx/branches/release_38/test/std/input.output/iostream.format/ext.manip/put_time.pass.cpp libcxx/branches/release_38/test/std/input.output/iostreams.base/ios.base/ios.base.callback/register_callback.pass.cpp libcxx/branches/release_38/test/std/input.output/iostreams.base/ios.base/ios.base.locales/imbue.pass.cpp libcxx/branches/release_38/test/std/input.output/iostreams.base/ios/basic.ios.members/imbue.pass.cpp libcxx/branches/release_38/test/std/input.output/stream.buffers/streambuf/streambuf.cons/copy.pass.cpp libcxx/branches/release_38/test/std/input.output/stream.buffers/streambuf/streambuf.cons/default.pass.cpp libcxx/branches/release_38/test/std/input.output/stream.buffers/streambuf/streambuf.protected/streambuf.assign/assign.pass.cpp libcxx/branches/release_38/test/std/input.output/stream.buffers/streambuf/streambuf.protected/streambuf.assign/swap.pass.cpp libcxx/branches/release_38/test/std/localization/locale.categories/category.collate/locale.collate.byname/hash.pass.cpp libcxx/branches/release_38/test/std/localization/locale.categories/category.collate/locale.collate.byname/types.pass.cpp libcxx/branches/release_38/test/std/localization/locale.categories/category.ctype/locale.codecvt.byname/ctor_wchar_t.pass.cpp libcxx/branches/release_38/test/std/localization/locale.categories/category.ctype/locale.ctype.byname/types.pass.cpp libcxx/branches/release_38/test/std/localization/locales/locale/locale.cons/default.pass.cpp libcxx/branches/release_38/test/std/localization/locales/locale/locale.cons/locale_string_cat.pass.cpp libcxx/branches/release_38/test/std/localization/locales/locale/locale.members/name.pass.cpp libcxx/branches/release_38/test/std/localization/locales/locale/locale.operators/eq.pass.cpp libcxx/branches/release_38/test/std/localization/locales/locale/locale.statics/global.pass.cpp libcxx/branches/release_38/test/std/re/re.regex/re.regex.locale/imbue.pass.cpp libcxx/branches/release_38/test/std/re/re.traits/default.pass.cpp libcxx/branches/release_38/test/std/re/re.traits/getloc.pass.cpp libcxx/branches/release_38/test/std/re/re.traits/imbue.pass.cpp Propchange: libcxx/branches/release_38/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Jan 26 18:07:27 2016 @@ -1,2 +1,2 @@ /libcxx/branches/apple:136569-137939 -/libcxx/trunk:257682,257696,257702 +/libcxx/trunk:257682,257696,257702,258403 Modified: libcxx/branches/release_38/test/std/input.output/file.streams/fstreams/filebuf.virtuals/overflow.pass.cpp URL: http://llvm.org/viewvc/llvm-project/libcxx/branches/release_38/test/std/input.output/file.streams/fstreams/filebuf.virtuals/overflow.pass.cpp?rev=258887&r1=258886&r2=258887&view=diff ============================================================================== --- libcxx/branches/release_38/test/std/input.output/file.streams/fstreams/filebuf.virtuals/overflow.pass.cpp (original) +++ libcxx/branches/release_38/test/std/input.output/file.streams/fstreams/filebuf.virtuals/overflow.pass.cpp Tue Jan 26 18:07:27 2016 @@ -7,6 +7,8 @@ // //===----------------------------------------------------------------------===// +// REQUIRES: locale.en_US.UTF-8 + // <fstream> // int_type overflow(int_type c = traits::eof()); Modified: libcxx/branches/release_38/test/std/input.output/file.streams/fstreams/filebuf.virtuals/underflow.pass.cpp URL: http://llvm.org/viewvc/llvm-project/libcxx/branches/release_38/test/std/input.output/file.streams/fstreams/filebuf.virtuals/underflow.pass.cpp?rev=258887&r1=258886&r2=258887&view=diff ============================================================================== --- libcxx/branches/release_38/test/std/input.output/file.streams/fstreams/filebuf.virtuals/underflow.pass.cpp (original) +++ libcxx/branches/release_38/test/std/input.output/file.streams/fstreams/filebuf.virtuals/underflow.pass.cpp Tue Jan 26 18:07:27 2016 @@ -7,6 +7,8 @@ // //===----------------------------------------------------------------------===// +// REQUIRES: locale.en_US.UTF-8 + // <fstream> // int_type underflow(); Modified: libcxx/branches/release_38/test/std/input.output/iostream.format/ext.manip/get_time.pass.cpp URL: http://llvm.org/viewvc/llvm-project/libcxx/branches/release_38/test/std/input.output/iostream.format/ext.manip/get_time.pass.cpp?rev=258887&r1=258886&r2=258887&view=diff ============================================================================== --- libcxx/branches/release_38/test/std/input.output/iostream.format/ext.manip/get_time.pass.cpp (original) +++ libcxx/branches/release_38/test/std/input.output/iostream.format/ext.manip/get_time.pass.cpp Tue Jan 26 18:07:27 2016 @@ -7,6 +7,8 @@ // //===----------------------------------------------------------------------===// +// REQUIRES: locale.en_US.UTF-8 + // <iomanip> // template <class charT> T9 get_time(struct tm* tmb, const charT* fmt); Modified: libcxx/branches/release_38/test/std/input.output/iostream.format/ext.manip/put_time.pass.cpp URL: http://llvm.org/viewvc/llvm-project/libcxx/branches/release_38/test/std/input.output/iostream.format/ext.manip/put_time.pass.cpp?rev=258887&r1=258886&r2=258887&view=diff ============================================================================== --- libcxx/branches/release_38/test/std/input.output/iostream.format/ext.manip/put_time.pass.cpp (original) +++ libcxx/branches/release_38/test/std/input.output/iostream.format/ext.manip/put_time.pass.cpp Tue Jan 26 18:07:27 2016 @@ -7,6 +7,8 @@ // //===----------------------------------------------------------------------===// +// REQUIRES: locale.en_US.UTF-8 + // <iomanip> // template <class charT> T10 put_time(const struct tm* tmb, const charT* fmt); Modified: libcxx/branches/release_38/test/std/input.output/iostreams.base/ios.base/ios.base.callback/register_callback.pass.cpp URL: http://llvm.org/viewvc/llvm-project/libcxx/branches/release_38/test/std/input.output/iostreams.base/ios.base/ios.base.callback/register_callback.pass.cpp?rev=258887&r1=258886&r2=258887&view=diff ============================================================================== --- libcxx/branches/release_38/test/std/input.output/iostreams.base/ios.base/ios.base.callback/register_callback.pass.cpp (original) +++ libcxx/branches/release_38/test/std/input.output/iostreams.base/ios.base/ios.base.callback/register_callback.pass.cpp Tue Jan 26 18:07:27 2016 @@ -7,6 +7,8 @@ // //===----------------------------------------------------------------------===// +// REQUIRES: locale.en_US.UTF-8 + // <ios> // class ios_base Modified: libcxx/branches/release_38/test/std/input.output/iostreams.base/ios.base/ios.base.locales/imbue.pass.cpp URL: http://llvm.org/viewvc/llvm-project/libcxx/branches/release_38/test/std/input.output/iostreams.base/ios.base/ios.base.locales/imbue.pass.cpp?rev=258887&r1=258886&r2=258887&view=diff ============================================================================== --- libcxx/branches/release_38/test/std/input.output/iostreams.base/ios.base/ios.base.locales/imbue.pass.cpp (original) +++ libcxx/branches/release_38/test/std/input.output/iostreams.base/ios.base/ios.base.locales/imbue.pass.cpp Tue Jan 26 18:07:27 2016 @@ -7,6 +7,8 @@ // //===----------------------------------------------------------------------===// +// REQUIRES: locale.en_US.UTF-8 + // <ios> // class ios_base Modified: libcxx/branches/release_38/test/std/input.output/iostreams.base/ios/basic.ios.members/imbue.pass.cpp URL: http://llvm.org/viewvc/llvm-project/libcxx/branches/release_38/test/std/input.output/iostreams.base/ios/basic.ios.members/imbue.pass.cpp?rev=258887&r1=258886&r2=258887&view=diff ============================================================================== --- libcxx/branches/release_38/test/std/input.output/iostreams.base/ios/basic.ios.members/imbue.pass.cpp (original) +++ libcxx/branches/release_38/test/std/input.output/iostreams.base/ios/basic.ios.members/imbue.pass.cpp Tue Jan 26 18:07:27 2016 @@ -7,6 +7,8 @@ // //===----------------------------------------------------------------------===// +// REQUIRES: locale.en_US.UTF-8 + // <ios> // template <class charT, class traits> class basic_ios Modified: libcxx/branches/release_38/test/std/input.output/stream.buffers/streambuf/streambuf.cons/copy.pass.cpp URL: http://llvm.org/viewvc/llvm-project/libcxx/branches/release_38/test/std/input.output/stream.buffers/streambuf/streambuf.cons/copy.pass.cpp?rev=258887&r1=258886&r2=258887&view=diff ============================================================================== --- libcxx/branches/release_38/test/std/input.output/stream.buffers/streambuf/streambuf.cons/copy.pass.cpp (original) +++ libcxx/branches/release_38/test/std/input.output/stream.buffers/streambuf/streambuf.cons/copy.pass.cpp Tue Jan 26 18:07:27 2016 @@ -7,6 +7,8 @@ // //===----------------------------------------------------------------------===// +// REQUIRES: locale.en_US.UTF-8 + // <streambuf> // template <class charT, class traits = char_traits<charT> > Modified: libcxx/branches/release_38/test/std/input.output/stream.buffers/streambuf/streambuf.cons/default.pass.cpp URL: http://llvm.org/viewvc/llvm-project/libcxx/branches/release_38/test/std/input.output/stream.buffers/streambuf/streambuf.cons/default.pass.cpp?rev=258887&r1=258886&r2=258887&view=diff ============================================================================== --- libcxx/branches/release_38/test/std/input.output/stream.buffers/streambuf/streambuf.cons/default.pass.cpp (original) +++ libcxx/branches/release_38/test/std/input.output/stream.buffers/streambuf/streambuf.cons/default.pass.cpp Tue Jan 26 18:07:27 2016 @@ -7,6 +7,8 @@ // //===----------------------------------------------------------------------===// +// REQUIRES: locale.en_US.UTF-8 + // <streambuf> // template <class charT, class traits = char_traits<charT> > Modified: libcxx/branches/release_38/test/std/input.output/stream.buffers/streambuf/streambuf.protected/streambuf.assign/assign.pass.cpp URL: http://llvm.org/viewvc/llvm-project/libcxx/branches/release_38/test/std/input.output/stream.buffers/streambuf/streambuf.protected/streambuf.assign/assign.pass.cpp?rev=258887&r1=258886&r2=258887&view=diff ============================================================================== --- libcxx/branches/release_38/test/std/input.output/stream.buffers/streambuf/streambuf.protected/streambuf.assign/assign.pass.cpp (original) +++ libcxx/branches/release_38/test/std/input.output/stream.buffers/streambuf/streambuf.protected/streambuf.assign/assign.pass.cpp Tue Jan 26 18:07:27 2016 @@ -7,6 +7,8 @@ // //===----------------------------------------------------------------------===// +// REQUIRES: locale.en_US.UTF-8 + // <streambuf> // template <class charT, class traits = char_traits<charT> > Modified: libcxx/branches/release_38/test/std/input.output/stream.buffers/streambuf/streambuf.protected/streambuf.assign/swap.pass.cpp URL: http://llvm.org/viewvc/llvm-project/libcxx/branches/release_38/test/std/input.output/stream.buffers/streambuf/streambuf.protected/streambuf.assign/swap.pass.cpp?rev=258887&r1=258886&r2=258887&view=diff ============================================================================== --- libcxx/branches/release_38/test/std/input.output/stream.buffers/streambuf/streambuf.protected/streambuf.assign/swap.pass.cpp (original) +++ libcxx/branches/release_38/test/std/input.output/stream.buffers/streambuf/streambuf.protected/streambuf.assign/swap.pass.cpp Tue Jan 26 18:07:27 2016 @@ -7,6 +7,8 @@ // //===----------------------------------------------------------------------===// +// REQUIRES: locale.en_US.UTF-8 + // <streambuf> // template <class charT, class traits = char_traits<charT> > Modified: libcxx/branches/release_38/test/std/localization/locale.categories/category.collate/locale.collate.byname/hash.pass.cpp URL: http://llvm.org/viewvc/llvm-project/libcxx/branches/release_38/test/std/localization/locale.categories/category.collate/locale.collate.byname/hash.pass.cpp?rev=258887&r1=258886&r2=258887&view=diff ============================================================================== --- libcxx/branches/release_38/test/std/localization/locale.categories/category.collate/locale.collate.byname/hash.pass.cpp (original) +++ libcxx/branches/release_38/test/std/localization/locale.categories/category.collate/locale.collate.byname/hash.pass.cpp Tue Jan 26 18:07:27 2016 @@ -7,6 +7,8 @@ // //===----------------------------------------------------------------------===// +// REQUIRES: locale.en_US.UTF-8 + // <locale> // template <class charT> class collate_byname Modified: libcxx/branches/release_38/test/std/localization/locale.categories/category.collate/locale.collate.byname/types.pass.cpp URL: http://llvm.org/viewvc/llvm-project/libcxx/branches/release_38/test/std/localization/locale.categories/category.collate/locale.collate.byname/types.pass.cpp?rev=258887&r1=258886&r2=258887&view=diff ============================================================================== --- libcxx/branches/release_38/test/std/localization/locale.categories/category.collate/locale.collate.byname/types.pass.cpp (original) +++ libcxx/branches/release_38/test/std/localization/locale.categories/category.collate/locale.collate.byname/types.pass.cpp Tue Jan 26 18:07:27 2016 @@ -7,6 +7,8 @@ // //===----------------------------------------------------------------------===// +// REQUIRES: locale.en_US.UTF-8 + // <locale> // template <class charT> Modified: libcxx/branches/release_38/test/std/localization/locale.categories/category.ctype/locale.codecvt.byname/ctor_wchar_t.pass.cpp URL: http://llvm.org/viewvc/llvm-project/libcxx/branches/release_38/test/std/localization/locale.categories/category.ctype/locale.codecvt.byname/ctor_wchar_t.pass.cpp?rev=258887&r1=258886&r2=258887&view=diff ============================================================================== --- libcxx/branches/release_38/test/std/localization/locale.categories/category.ctype/locale.codecvt.byname/ctor_wchar_t.pass.cpp (original) +++ libcxx/branches/release_38/test/std/localization/locale.categories/category.ctype/locale.codecvt.byname/ctor_wchar_t.pass.cpp Tue Jan 26 18:07:27 2016 @@ -7,6 +7,8 @@ // //===----------------------------------------------------------------------===// +// REQUIRES: locale.en_US.UTF-8 + // <locale> // template <> class codecvt_byname<wchar_t, char, mbstate_t> Modified: libcxx/branches/release_38/test/std/localization/locale.categories/category.ctype/locale.ctype.byname/types.pass.cpp URL: http://llvm.org/viewvc/llvm-project/libcxx/branches/release_38/test/std/localization/locale.categories/category.ctype/locale.ctype.byname/types.pass.cpp?rev=258887&r1=258886&r2=258887&view=diff ============================================================================== --- libcxx/branches/release_38/test/std/localization/locale.categories/category.ctype/locale.ctype.byname/types.pass.cpp (original) +++ libcxx/branches/release_38/test/std/localization/locale.categories/category.ctype/locale.ctype.byname/types.pass.cpp Tue Jan 26 18:07:27 2016 @@ -7,6 +7,8 @@ // //===----------------------------------------------------------------------===// +// REQUIRES: locale.en_US.UTF-8 + // <locale> // template <class CharT> Modified: libcxx/branches/release_38/test/std/localization/locales/locale/locale.cons/default.pass.cpp URL: http://llvm.org/viewvc/llvm-project/libcxx/branches/release_38/test/std/localization/locales/locale/locale.cons/default.pass.cpp?rev=258887&r1=258886&r2=258887&view=diff ============================================================================== --- libcxx/branches/release_38/test/std/localization/locales/locale/locale.cons/default.pass.cpp (original) +++ libcxx/branches/release_38/test/std/localization/locales/locale/locale.cons/default.pass.cpp Tue Jan 26 18:07:27 2016 @@ -7,6 +7,8 @@ // //===----------------------------------------------------------------------===// +// REQUIRES: locale.en_US.UTF-8 + // <locale> // locale() throw(); Modified: libcxx/branches/release_38/test/std/localization/locales/locale/locale.cons/locale_string_cat.pass.cpp URL: http://llvm.org/viewvc/llvm-project/libcxx/branches/release_38/test/std/localization/locales/locale/locale.cons/locale_string_cat.pass.cpp?rev=258887&r1=258886&r2=258887&view=diff ============================================================================== --- libcxx/branches/release_38/test/std/localization/locales/locale/locale.cons/locale_string_cat.pass.cpp (original) +++ libcxx/branches/release_38/test/std/localization/locales/locale/locale.cons/locale_string_cat.pass.cpp Tue Jan 26 18:07:27 2016 @@ -6,7 +6,8 @@ // Source Licenses. See LICENSE.TXT for details. // //===----------------------------------------------------------------------===// - + +// REQUIRES: locale.en_US.UTF-8 // REQUIRES: locale.ru_RU.UTF-8 // UNSUPPORTED: sanitizer-new-delete Modified: libcxx/branches/release_38/test/std/localization/locales/locale/locale.members/name.pass.cpp URL: http://llvm.org/viewvc/llvm-project/libcxx/branches/release_38/test/std/localization/locales/locale/locale.members/name.pass.cpp?rev=258887&r1=258886&r2=258887&view=diff ============================================================================== --- libcxx/branches/release_38/test/std/localization/locales/locale/locale.members/name.pass.cpp (original) +++ libcxx/branches/release_38/test/std/localization/locales/locale/locale.members/name.pass.cpp Tue Jan 26 18:07:27 2016 @@ -7,6 +7,8 @@ // //===----------------------------------------------------------------------===// +// REQUIRES: locale.en_US.UTF-8 + // <locale> // basic_string<char> name() const; Modified: libcxx/branches/release_38/test/std/localization/locales/locale/locale.operators/eq.pass.cpp URL: http://llvm.org/viewvc/llvm-project/libcxx/branches/release_38/test/std/localization/locales/locale/locale.operators/eq.pass.cpp?rev=258887&r1=258886&r2=258887&view=diff ============================================================================== --- libcxx/branches/release_38/test/std/localization/locales/locale/locale.operators/eq.pass.cpp (original) +++ libcxx/branches/release_38/test/std/localization/locales/locale/locale.operators/eq.pass.cpp Tue Jan 26 18:07:27 2016 @@ -7,6 +7,8 @@ // //===----------------------------------------------------------------------===// +// REQUIRES: locale.en_US.UTF-8 + // <locale> // basic_string<char> name() const; Modified: libcxx/branches/release_38/test/std/localization/locales/locale/locale.statics/global.pass.cpp URL: http://llvm.org/viewvc/llvm-project/libcxx/branches/release_38/test/std/localization/locales/locale/locale.statics/global.pass.cpp?rev=258887&r1=258886&r2=258887&view=diff ============================================================================== --- libcxx/branches/release_38/test/std/localization/locales/locale/locale.statics/global.pass.cpp (original) +++ libcxx/branches/release_38/test/std/localization/locales/locale/locale.statics/global.pass.cpp Tue Jan 26 18:07:27 2016 @@ -7,6 +7,8 @@ // //===----------------------------------------------------------------------===// +// REQUIRES: locale.en_US.UTF-8 + // <locale> // static const locale& classic(); Modified: libcxx/branches/release_38/test/std/re/re.regex/re.regex.locale/imbue.pass.cpp URL: http://llvm.org/viewvc/llvm-project/libcxx/branches/release_38/test/std/re/re.regex/re.regex.locale/imbue.pass.cpp?rev=258887&r1=258886&r2=258887&view=diff ============================================================================== --- libcxx/branches/release_38/test/std/re/re.regex/re.regex.locale/imbue.pass.cpp (original) +++ libcxx/branches/release_38/test/std/re/re.regex/re.regex.locale/imbue.pass.cpp Tue Jan 26 18:07:27 2016 @@ -7,6 +7,8 @@ // //===----------------------------------------------------------------------===// +// REQUIRES: locale.en_US.UTF-8 + // <regex> // template <class charT, class traits = regex_traits<charT>> class basic_regex; Modified: libcxx/branches/release_38/test/std/re/re.traits/default.pass.cpp URL: http://llvm.org/viewvc/llvm-project/libcxx/branches/release_38/test/std/re/re.traits/default.pass.cpp?rev=258887&r1=258886&r2=258887&view=diff ============================================================================== --- libcxx/branches/release_38/test/std/re/re.traits/default.pass.cpp (original) +++ libcxx/branches/release_38/test/std/re/re.traits/default.pass.cpp Tue Jan 26 18:07:27 2016 @@ -8,6 +8,8 @@ // //===----------------------------------------------------------------------===// +// REQUIRES: locale.en_US.UTF-8 + // <regex> // template <class charT> struct regex_traits; Modified: libcxx/branches/release_38/test/std/re/re.traits/getloc.pass.cpp URL: http://llvm.org/viewvc/llvm-project/libcxx/branches/release_38/test/std/re/re.traits/getloc.pass.cpp?rev=258887&r1=258886&r2=258887&view=diff ============================================================================== --- libcxx/branches/release_38/test/std/re/re.traits/getloc.pass.cpp (original) +++ libcxx/branches/release_38/test/std/re/re.traits/getloc.pass.cpp Tue Jan 26 18:07:27 2016 @@ -7,6 +7,8 @@ // //===----------------------------------------------------------------------===// +// REQUIRES: locale.en_US.UTF-8 + // <regex> // template <class charT> struct regex_traits; Modified: libcxx/branches/release_38/test/std/re/re.traits/imbue.pass.cpp URL: http://llvm.org/viewvc/llvm-project/libcxx/branches/release_38/test/std/re/re.traits/imbue.pass.cpp?rev=258887&r1=258886&r2=258887&view=diff ============================================================================== --- libcxx/branches/release_38/test/std/re/re.traits/imbue.pass.cpp (original) +++ libcxx/branches/release_38/test/std/re/re.traits/imbue.pass.cpp Tue Jan 26 18:07:27 2016 @@ -7,6 +7,8 @@ // //===----------------------------------------------------------------------===// +// REQUIRES: locale.en_US.UTF-8 + // <regex> // template <class charT> struct regex_traits; _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
