[libc++] Get rid of _LIBCPP_HAS_OPEN_WITH_WCHAR in the test suite

[philnik]

LGTM % comment.

libcxx/test/libcxx/input.output/file.streams/fstreams/wide_temp_file.h

18 ↗

(On Diff #465024)

Since we are in the test suite I'd rather use TEST_DIAGNOSTIC_PUSH, TEST_CLANG_DIAGNOSTIC_IGNORED and TEST_DIAGNOSTIC_POP.

[ldionne]

Remove libc++ macros from tests.

libcxx/test/libcxx/input.output/file.streams/fstreams/wide_temp_file.h

18 ↗

(On Diff #465024)

Thanks, I forgot we had those.

[Mordante]

LGTM modulo one comment.

libcxx/test/libcxx/input.output/file.streams/fstreams/fstream.members/open_wchar_pointer.pass.cpp

23

I'm not fond of include paths containing .. since it may include files at unexpected locations.
How about moving this file to the test/support directory instead?

[ldionne]

Address comments

[ldionne]

libcxx/test/libcxx/input.output/file.streams/fstreams/fstream.members/open_wchar_pointer.pass.cpp

23

I can do that, but I'm not sure how this can end up selecting a file at an unexpected location, since the current directory is always the first path that the preprocessor looks in for "" style includes.

[Mordante]

libcxx/test/libcxx/input.output/file.streams/fstreams/fstream.members/open_wchar_pointer.pass.cpp

23

I've had issues with .. in the past, but it no longer occur with newer compilers.

libcxx/test/libcxx/input.output/file.streams/fstreams/fstream.cons/wchar_pointer.pass.cpp

 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
 // <fstream>
 
 // template <class charT, class traits = char_traits<charT> >
 // class basic_fstream
 
 // explicit basic_fstream(const wchar_t* s, ios_base::openmode mode = ios_base::in | ios_base::out);
 
+// This extension is only provided on Windows.
+// REQUIRES: windows
+// UNSUPPORTED: no-wide-characters
+
 #include <fstream>
 #include <cassert>
 #include "test_macros.h"
-#include "platform_support.h"
+#include "wide_temp_file.h"
 
-int main(int, char**)
-{
-#ifdef _LIBCPP_HAS_OPEN_WITH_WCHAR
+int main(int, char**) {
     std::wstring temp = get_wide_temp_file_name();
     {
         std::fstream fs(temp.c_str(), std::ios_base::in | std::ios_base::out
                                                 | std::ios_base::trunc);
         double x = 0;
         fs << 3.25;
         fs.seekg(0);
         fs >> x;
         assert(x == 3.25);
     }
     _wremove(temp.c_str());
     {
         std::wfstream fs(temp.c_str(), std::ios_base::in | std::ios_base::out
                                                  | std::ios_base::trunc);
         double x = 0;
         fs << 3.25;
         fs.seekg(0);
         fs >> x;
         assert(x == 3.25);
     }
     _wremove(temp.c_str());
-#endif
 
     return 0;
 }

libcxx/test/libcxx/input.output/file.streams/fstreams/fstream.members/open_wchar_pointer.pass.cpp

 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
 // <fstream>
 
 // template <class charT, class traits = char_traits<charT> >
 // class basic_fstream
 
 // void open(const wchar_t* s, ios_base::openmode mode = ios_base::in|ios_base::out);
 
+// This extension is only provided on Windows.
+// REQUIRES: windows
+// UNSUPPORTED: no-wide-characters
+
 #include <fstream>
 #include <cassert>
 #include "test_macros.h"
-#include "platform_support.h"
+#include "wide_temp_file.h"
 
-int main(int, char**)
-{
-#ifdef _LIBCPP_HAS_OPEN_WITH_WCHAR
+int main(int, char**) {
     std::wstring temp = get_wide_temp_file_name();
     {
         std::fstream fs;
         assert(!fs.is_open());
         fs.open(temp.c_str(), std::ios_base::in | std::ios_base::out
                                         | std::ios_base::trunc);
         assert(fs.is_open());
         double x = 0;
_wremove(temp.c_str());
         assert(fs.is_open());
         double x = 0;
         fs << 3.25;
         fs.seekg(0);
         fs >> x;
         assert(x == 3.25);
     }
     _wremove(temp.c_str());
-#endif
 
     return 0;
 }

libcxx/test/libcxx/input.output/file.streams/fstreams/ifstream.cons/wchar_pointer.pass.cpp

 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
 // <fstream>
 
 // template <class charT, class traits = char_traits<charT> >
 // class basic_ifstream
 
 // explicit basic_ifstream(const wchar_t* s, ios_base::openmode mode = ios_base::in);
 
+// This extension is only provided on Windows.
+// REQUIRES: windows
+// UNSUPPORTED: no-wide-characters
+
 // FILE_DEPENDENCIES: test.dat
 
 #include <fstream>
 #include <cassert>
 
 #include "test_macros.h"
 
-int main(int, char**)
-{
-#ifdef _LIBCPP_HAS_OPEN_WITH_WCHAR
+int main(int, char**) {
     {
         std::ifstream fs(L"test.dat");
         double x = 0;
         fs >> x;
         assert(x == 3.25);
     }
     // std::ifstream(const wchar_t*, std::ios_base::openmode) is tested in
     // test/libcxx/input.output/file.streams/fstreams/ofstream.cons/wchar_pointer.pass.cpp
     // which creates writable files.
     {
         std::wifstream fs(L"test.dat");
         double x = 0;
         fs >> x;
         assert(x == 3.25);
     }
     // std::wifstream(const wchar_t*, std::ios_base::openmode) is tested in
     // test/libcxx/input.output/file.streams/fstreams/ofstream.cons/wchar_pointer.pass.cpp
     // which creates writable files.
-#endif
 
     return 0;
 }

libcxx/test/libcxx/input.output/file.streams/fstreams/ifstream.members/open_wchar_pointer.pass.cpp

 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
 // <fstream>
 
 // template <class charT, class traits = char_traits<charT> >
 // class basic_ifstream
 
 // void open(const wchar_t* s, ios_base::openmode mode = ios_base::in);
 
+// This extension is only provided on Windows.
+// REQUIRES: windows
+// UNSUPPORTED: no-wide-characters
+
 // FILE_DEPENDENCIES: test.dat
 
 #include <fstream>
 #include <cassert>
 
 #include "test_macros.h"
 
-int main(int, char**)
-{
-#ifdef _LIBCPP_HAS_OPEN_WITH_WCHAR
+int main(int, char**) {
     {
         std::ifstream fs;
         assert(!fs.is_open());
         char c = 'a';
         fs >> c;
         assert(fs.fail());
         assert(c == 'a');
         fs.open(L"test.dat");
         assert(fs.is_open());
         fs >> c;
         assert(c == 'r');
     }
     {
         std::wifstream fs;
         assert(!fs.is_open());
         wchar_t c = L'a';
         fs >> c;
         assert(fs.fail());
         assert(c == L'a');
         fs.open(L"test.dat");
         assert(fs.is_open());
         fs >> c;
         assert(c == L'r');
     }
-#endif
 
     return 0;
 }

libcxx/test/libcxx/input.output/file.streams/fstreams/ofstream.cons/wchar_pointer.pass.cpp

 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
 // <fstream>
 
 // template <class charT, class traits = char_traits<charT> >
 // class basic_ofstream
 
 // explicit basic_ofstream(const wchar_t* s, ios_base::openmode mode = ios_base::out);
 
+// This extension is only provided on Windows.
+// REQUIRES: windows
+// UNSUPPORTED: no-wide-characters
+
 #include <fstream>
 #include <cassert>
 #include "test_macros.h"
-#include "platform_support.h"
+#include "wide_temp_file.h"
 
-int main(int, char**)
-{
-#ifdef _LIBCPP_HAS_OPEN_WITH_WCHAR
+int main(int, char**) {
     std::wstring temp = get_wide_temp_file_name();
     {
         std::ofstream fs(temp.c_str());
         fs << 3.25;
     }
     {
         std::ifstream fs(temp.c_str());
         double x = 0;
int main(int, char**) {
     }
     {
         std::wifstream fs(temp.c_str(), std::ios_base::out);
         double x = 0;
         fs >> x;
         assert(x == 3.25);
     }
     _wremove(temp.c_str());
-#endif
 
     return 0;
 }

libcxx/test/libcxx/input.output/file.streams/fstreams/ofstream.members/open_wchar_pointer.pass.cpp

 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
 // <fstream>
 
 // template <class charT, class traits = char_traits<charT> >
 // class basic_ofstream
 
 // void open(const wchar_t* s, ios_base::openmode mode = ios_base::out);
 
+// This extension is only provided on Windows.
+// REQUIRES: windows
+// UNSUPPORTED: no-wide-characters
+
 #include <fstream>
 #include <cassert>
 #include "test_macros.h"
-#include "platform_support.h"
+#include "wide_temp_file.h"
 
-int main(int, char**)
-{
-#ifdef _LIBCPP_HAS_OPEN_WITH_WCHAR
+int main(int, char**) {
     std::wstring temp = get_wide_temp_file_name();
     {
         std::ofstream fs;
         assert(!fs.is_open());
         char c = 'a';
         fs << c;
         assert(fs.fail());
         fs.open(temp.c_str());
int main(int, char**) {
     }
     {
         std::wifstream fs(temp.c_str());
         wchar_t c = 0;
         fs >> c;
         assert(c == L'a');
     }
     _wremove(temp.c_str());
-#endif
 
     return 0;
 }

libcxx/test/support/platform_support.h

 #    define LOCALE_cs_CZ_ISO8859_2 "cs_CZ.ISO8859-2"
 #endif
 #define LOCALE_ja_JP_UTF_8     "ja_JP.UTF-8"
 #define LOCALE_ru_RU_UTF_8     "ru_RU.UTF-8"
 #define LOCALE_zh_CN_UTF_8     "zh_CN.UTF-8"
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <codecvt>
-#include <locale>
 #include <string>
 #if defined(_WIN32)
 #   include <io.h> // _mktemp_s
 #   include <fcntl.h> // _O_EXCL, ...
 #   include <sys/stat.h> // _S_IREAD, ...
 #else
 #   include <unistd.h> // close
 #endif
if (FD == -1) {
         perror("mkstemp");
         abort();
     }
     close(FD);
     return Name;
 #endif
 }
 
-_LIBCPP_SUPPRESS_DEPRECATED_PUSH
-#ifdef _LIBCPP_HAS_OPEN_WITH_WCHAR
-inline
-std::wstring get_wide_temp_file_name()
-{
-    return std::wstring_convert<std::codecvt_utf8_utf16<wchar_t> >().from_bytes(
-        get_temp_file_name());
-}
-#endif // _LIBCPP_HAS_OPEN_WITH_WCHAR
-_LIBCPP_SUPPRESS_DEPRECATED_POP
-
 #if defined(_CS_GNU_LIBC_VERSION)
 inline bool glibc_version_less_than(char const* version) {
   std::string test_version = std::string("glibc ") + version;
 
   size_t n = confstr(_CS_GNU_LIBC_VERSION, nullptr, (size_t)0);
   char *current_version = new char[n];
   confstr(_CS_GNU_LIBC_VERSION, current_version, n);
 
   bool result = strverscmp(current_version, test_version.c_str()) < 0;
   delete[] current_version;
   return result;
 }
 #endif // _CS_GNU_LIBC_VERSION
 
 #endif // PLATFORM_SUPPORT_H

libcxx/test/support/wide_temp_file.h

+//===----------------------------------------------------------------------===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef TEST_SUPPORT_WIDE_TEMP_FILE_H
+#define TEST_SUPPORT_WIDE_TEMP_FILE_H
+
+#include <codecvt>
+#include <locale>
+#include <string>
+
+#include "platform_support.h"
+#include "test_macros.h"
+
+TEST_DIAGNOSTIC_PUSH
+TEST_CLANG_DIAGNOSTIC_IGNORED("-Wdeprecated-declarations")
+TEST_GCC_DIAGNOSTIC_IGNORED("-Wdeprecated-declarations")
+inline std::wstring get_wide_temp_file_name() {
+    return std::wstring_convert<std::codecvt_utf8_utf16<wchar_t> >().from_bytes(get_temp_file_name());
+}
+TEST_DIAGNOSTIC_POP
+
+#endif // TEST_SUPPORT_WIDE_TEMP_FILE_H

libcxx/utils/libcxx/test/features.py

 }
 for locale, alts in locales.items():
   # Note: Using alts directly in the lambda body here will bind it to the value at the
   # end of the loop. Assigning it to a default argument works around this issue.
   DEFAULT_FEATURES.append(Feature(name='locale.{}'.format(locale),
                                   when=lambda cfg, alts=alts: hasAnyLocale(cfg, alts)))
 
 
-# Add features representing the platform name: darwin, linux, windows, etc...
+# Add features representing the target platform name: darwin, linux, windows, etc...
 DEFAULT_FEATURES += [
   Feature(name='darwin', when=lambda cfg: '__APPLE__' in compilerMacros(cfg)),
   Feature(name='windows', when=lambda cfg: '_WIN32' in compilerMacros(cfg)),
   Feature(name='windows-dll', when=lambda cfg: '_WIN32' in compilerMacros(cfg) and programSucceeds(cfg, """
             #include <iostream>
             #include <windows.h>
             #include <winnt.h>
             int main(int, char**) {