[libcxx] r328475 - Make filesystem tests generic between experimental and std versions.
Eric Fiselier via cfe-commits
cfe-commits at lists.llvm.org
Sun Mar 25 22:46:58 PDT 2018
Author: ericwf
Date: Sun Mar 25 22:46:57 2018
New Revision: 328475
URL: http://llvm.org/viewvc/llvm-project?rev=328475&view=rev
Log:
Make filesystem tests generic between experimental and std versions.
As I move towards implementing std::filesystem, there is a need to
make the existing tests run against both the std and experimental versions.
Additionally, it's helpful to allow running the tests against other
implementations of filesystem.
This patch converts the test to easily target either. First, it
adds a filesystem_include.hpp header which is soley responsible
for selecting and including the correct implementation. Second,
it converts existing tests to use this header instead of including
filesystem directly.
Added:
libcxx/trunk/test/support/filesystem_include.hpp
Modified:
libcxx/trunk/test/std/experimental/filesystem/class.directory_entry/directory_entry.cons.pass.cpp
libcxx/trunk/test/std/experimental/filesystem/class.directory_entry/directory_entry.mods.pass.cpp
libcxx/trunk/test/std/experimental/filesystem/class.directory_entry/directory_entry.obs/comparisons.pass.cpp
libcxx/trunk/test/std/experimental/filesystem/class.directory_entry/directory_entry.obs/path.pass.cpp
libcxx/trunk/test/std/experimental/filesystem/class.directory_entry/directory_entry.obs/status.pass.cpp
libcxx/trunk/test/std/experimental/filesystem/class.directory_entry/directory_entry.obs/symlink_status.pass.cpp
libcxx/trunk/test/std/experimental/filesystem/class.directory_iterator/directory_iterator.members/copy.pass.cpp
libcxx/trunk/test/std/experimental/filesystem/class.directory_iterator/directory_iterator.members/copy_assign.pass.cpp
libcxx/trunk/test/std/experimental/filesystem/class.directory_iterator/directory_iterator.members/ctor.pass.cpp
libcxx/trunk/test/std/experimental/filesystem/class.directory_iterator/directory_iterator.members/default_ctor.pass.cpp
libcxx/trunk/test/std/experimental/filesystem/class.directory_iterator/directory_iterator.members/increment.pass.cpp
libcxx/trunk/test/std/experimental/filesystem/class.directory_iterator/directory_iterator.members/move.pass.cpp
libcxx/trunk/test/std/experimental/filesystem/class.directory_iterator/directory_iterator.members/move_assign.pass.cpp
libcxx/trunk/test/std/experimental/filesystem/class.directory_iterator/directory_iterator.nonmembers/begin_end.pass.cpp
libcxx/trunk/test/std/experimental/filesystem/class.directory_iterator/types.pass.cpp
libcxx/trunk/test/std/experimental/filesystem/class.file_status/file_status.cons.pass.cpp
libcxx/trunk/test/std/experimental/filesystem/class.file_status/file_status.mods.pass.cpp
libcxx/trunk/test/std/experimental/filesystem/class.file_status/file_status.obs.pass.cpp
libcxx/trunk/test/std/experimental/filesystem/class.filesystem_error/filesystem_error.members.pass.cpp
libcxx/trunk/test/std/experimental/filesystem/class.path/path.itr/iterator.pass.cpp
libcxx/trunk/test/std/experimental/filesystem/class.path/path.member/path.append.pass.cpp
libcxx/trunk/test/std/experimental/filesystem/class.path/path.member/path.assign/braced_init.pass.cpp
libcxx/trunk/test/std/experimental/filesystem/class.path/path.member/path.assign/copy.pass.cpp
libcxx/trunk/test/std/experimental/filesystem/class.path/path.member/path.assign/move.pass.cpp
libcxx/trunk/test/std/experimental/filesystem/class.path/path.member/path.assign/source.pass.cpp
libcxx/trunk/test/std/experimental/filesystem/class.path/path.member/path.compare.pass.cpp
libcxx/trunk/test/std/experimental/filesystem/class.path/path.member/path.concat.pass.cpp
libcxx/trunk/test/std/experimental/filesystem/class.path/path.member/path.construct/copy.pass.cpp
libcxx/trunk/test/std/experimental/filesystem/class.path/path.member/path.construct/default.pass.cpp
libcxx/trunk/test/std/experimental/filesystem/class.path/path.member/path.construct/move.pass.cpp
libcxx/trunk/test/std/experimental/filesystem/class.path/path.member/path.construct/source.pass.cpp
libcxx/trunk/test/std/experimental/filesystem/class.path/path.member/path.decompose/empty.fail.cpp
libcxx/trunk/test/std/experimental/filesystem/class.path/path.member/path.decompose/path.decompose.pass.cpp
libcxx/trunk/test/std/experimental/filesystem/class.path/path.member/path.generic.obs/generic_string_alloc.pass.cpp
libcxx/trunk/test/std/experimental/filesystem/class.path/path.member/path.generic.obs/named_overloads.pass.cpp
libcxx/trunk/test/std/experimental/filesystem/class.path/path.member/path.modifiers/clear.pass.cpp
libcxx/trunk/test/std/experimental/filesystem/class.path/path.member/path.modifiers/make_preferred.pass.cpp
libcxx/trunk/test/std/experimental/filesystem/class.path/path.member/path.modifiers/remove_filename.pass.cpp
libcxx/trunk/test/std/experimental/filesystem/class.path/path.member/path.modifiers/replace_extension.pass.cpp
libcxx/trunk/test/std/experimental/filesystem/class.path/path.member/path.modifiers/replace_filename.pass.cpp
libcxx/trunk/test/std/experimental/filesystem/class.path/path.member/path.modifiers/swap.pass.cpp
libcxx/trunk/test/std/experimental/filesystem/class.path/path.member/path.native.obs/c_str.pass.cpp
libcxx/trunk/test/std/experimental/filesystem/class.path/path.member/path.native.obs/named_overloads.pass.cpp
libcxx/trunk/test/std/experimental/filesystem/class.path/path.member/path.native.obs/native.pass.cpp
libcxx/trunk/test/std/experimental/filesystem/class.path/path.member/path.native.obs/operator_string.pass.cpp
libcxx/trunk/test/std/experimental/filesystem/class.path/path.member/path.native.obs/string_alloc.pass.cpp
libcxx/trunk/test/std/experimental/filesystem/class.path/path.nonmember/append_op.pass.cpp
libcxx/trunk/test/std/experimental/filesystem/class.path/path.nonmember/path.factory.pass.cpp
libcxx/trunk/test/std/experimental/filesystem/class.path/path.nonmember/path.io.pass.cpp
libcxx/trunk/test/std/experimental/filesystem/class.path/path.nonmember/path.io.unicode_bug.pass.cpp
libcxx/trunk/test/std/experimental/filesystem/class.path/path.nonmember/swap.pass.cpp
libcxx/trunk/test/std/experimental/filesystem/class.path/synop.pass.cpp
libcxx/trunk/test/std/experimental/filesystem/class.rec.dir.itr/rec.dir.itr.members/copy.pass.cpp
libcxx/trunk/test/std/experimental/filesystem/class.rec.dir.itr/rec.dir.itr.members/copy_assign.pass.cpp
libcxx/trunk/test/std/experimental/filesystem/class.rec.dir.itr/rec.dir.itr.members/ctor.pass.cpp
libcxx/trunk/test/std/experimental/filesystem/class.rec.dir.itr/rec.dir.itr.members/depth.pass.cpp
libcxx/trunk/test/std/experimental/filesystem/class.rec.dir.itr/rec.dir.itr.members/disable_recursion_pending.pass.cpp
libcxx/trunk/test/std/experimental/filesystem/class.rec.dir.itr/rec.dir.itr.members/increment.pass.cpp
libcxx/trunk/test/std/experimental/filesystem/class.rec.dir.itr/rec.dir.itr.members/move.pass.cpp
libcxx/trunk/test/std/experimental/filesystem/class.rec.dir.itr/rec.dir.itr.members/move_assign.pass.cpp
libcxx/trunk/test/std/experimental/filesystem/class.rec.dir.itr/rec.dir.itr.members/pop.pass.cpp
libcxx/trunk/test/std/experimental/filesystem/class.rec.dir.itr/rec.dir.itr.members/recursion_pending.pass.cpp
libcxx/trunk/test/std/experimental/filesystem/class.rec.dir.itr/rec.dir.itr.nonmembers/begin_end.pass.cpp
libcxx/trunk/test/std/experimental/filesystem/fs.enum/enum.copy_options.pass.cpp
libcxx/trunk/test/std/experimental/filesystem/fs.enum/enum.directory_options.pass.cpp
libcxx/trunk/test/std/experimental/filesystem/fs.enum/enum.file_type.pass.cpp
libcxx/trunk/test/std/experimental/filesystem/fs.enum/enum.perms.pass.cpp
libcxx/trunk/test/std/experimental/filesystem/fs.filesystem.synopsis/file_time_type.pass.cpp
libcxx/trunk/test/std/experimental/filesystem/fs.op.funcs/fs.op.absolute/absolute.pass.cpp
libcxx/trunk/test/std/experimental/filesystem/fs.op.funcs/fs.op.canonical/canonical.pass.cpp
libcxx/trunk/test/std/experimental/filesystem/fs.op.funcs/fs.op.copy/copy.pass.cpp
libcxx/trunk/test/std/experimental/filesystem/fs.op.funcs/fs.op.copy_file/copy_file.pass.cpp
libcxx/trunk/test/std/experimental/filesystem/fs.op.funcs/fs.op.copy_symlink/copy_symlink.pass.cpp
libcxx/trunk/test/std/experimental/filesystem/fs.op.funcs/fs.op.create_directories/create_directories.pass.cpp
libcxx/trunk/test/std/experimental/filesystem/fs.op.funcs/fs.op.create_directory/create_directory.pass.cpp
libcxx/trunk/test/std/experimental/filesystem/fs.op.funcs/fs.op.create_directory/create_directory_with_attributes.pass.cpp
libcxx/trunk/test/std/experimental/filesystem/fs.op.funcs/fs.op.create_directory_symlink/create_directory_symlink.pass.cpp
libcxx/trunk/test/std/experimental/filesystem/fs.op.funcs/fs.op.create_hard_link/create_hard_link.pass.cpp
libcxx/trunk/test/std/experimental/filesystem/fs.op.funcs/fs.op.create_symlink/create_symlink.pass.cpp
libcxx/trunk/test/std/experimental/filesystem/fs.op.funcs/fs.op.current_path/current_path.pass.cpp
libcxx/trunk/test/std/experimental/filesystem/fs.op.funcs/fs.op.equivalent/equivalent.pass.cpp
libcxx/trunk/test/std/experimental/filesystem/fs.op.funcs/fs.op.exists/exists.pass.cpp
libcxx/trunk/test/std/experimental/filesystem/fs.op.funcs/fs.op.file_size/file_size.pass.cpp
libcxx/trunk/test/std/experimental/filesystem/fs.op.funcs/fs.op.hard_lk_ct/hard_link_count.pass.cpp
libcxx/trunk/test/std/experimental/filesystem/fs.op.funcs/fs.op.is_block_file/is_block_file.pass.cpp
libcxx/trunk/test/std/experimental/filesystem/fs.op.funcs/fs.op.is_char_file/is_character_file.pass.cpp
libcxx/trunk/test/std/experimental/filesystem/fs.op.funcs/fs.op.is_directory/is_directory.pass.cpp
libcxx/trunk/test/std/experimental/filesystem/fs.op.funcs/fs.op.is_empty/is_empty.pass.cpp
libcxx/trunk/test/std/experimental/filesystem/fs.op.funcs/fs.op.is_fifo/is_fifo.pass.cpp
libcxx/trunk/test/std/experimental/filesystem/fs.op.funcs/fs.op.is_other/is_other.pass.cpp
libcxx/trunk/test/std/experimental/filesystem/fs.op.funcs/fs.op.is_regular_file/is_regular_file.pass.cpp
libcxx/trunk/test/std/experimental/filesystem/fs.op.funcs/fs.op.is_socket/is_socket.pass.cpp
libcxx/trunk/test/std/experimental/filesystem/fs.op.funcs/fs.op.is_symlink/is_symlink.pass.cpp
libcxx/trunk/test/std/experimental/filesystem/fs.op.funcs/fs.op.last_write_time/last_write_time.pass.cpp
libcxx/trunk/test/std/experimental/filesystem/fs.op.funcs/fs.op.permissions/permissions.pass.cpp
libcxx/trunk/test/std/experimental/filesystem/fs.op.funcs/fs.op.read_symlink/read_symlink.pass.cpp
libcxx/trunk/test/std/experimental/filesystem/fs.op.funcs/fs.op.remove/remove.pass.cpp
libcxx/trunk/test/std/experimental/filesystem/fs.op.funcs/fs.op.remove_all/remove_all.pass.cpp
libcxx/trunk/test/std/experimental/filesystem/fs.op.funcs/fs.op.rename/rename.pass.cpp
libcxx/trunk/test/std/experimental/filesystem/fs.op.funcs/fs.op.resize_file/resize_file.pass.cpp
libcxx/trunk/test/std/experimental/filesystem/fs.op.funcs/fs.op.space/space.pass.cpp
libcxx/trunk/test/std/experimental/filesystem/fs.op.funcs/fs.op.status/status.pass.cpp
libcxx/trunk/test/std/experimental/filesystem/fs.op.funcs/fs.op.status_known/status_known.pass.cpp
libcxx/trunk/test/std/experimental/filesystem/fs.op.funcs/fs.op.symlink_status/symlink_status.pass.cpp
libcxx/trunk/test/std/experimental/filesystem/fs.op.funcs/fs.op.system_complete/system_complete.pass.cpp
libcxx/trunk/test/std/experimental/filesystem/fs.op.funcs/fs.op.temp_dir_path/temp_directory_path.pass.cpp
libcxx/trunk/test/std/experimental/filesystem/fs.req.macros/feature_macro.pass.cpp
libcxx/trunk/test/support/filesystem_test_helper.hpp
Modified: libcxx/trunk/test/std/experimental/filesystem/class.directory_entry/directory_entry.cons.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/experimental/filesystem/class.directory_entry/directory_entry.cons.pass.cpp?rev=328475&r1=328474&r2=328475&view=diff
==============================================================================
--- libcxx/trunk/test/std/experimental/filesystem/class.directory_entry/directory_entry.cons.pass.cpp (original)
+++ libcxx/trunk/test/std/experimental/filesystem/class.directory_entry/directory_entry.cons.pass.cpp Sun Mar 25 22:46:57 2018
@@ -18,11 +18,10 @@
// directory_entry(directory_entry&&) noexcept = default;
// explicit directory_entry(const path);
-#include <experimental/filesystem>
+#include "filesystem_include.hpp"
#include <type_traits>
#include <cassert>
-namespace fs = std::experimental::filesystem;
void test_default_ctor()
{
Modified: libcxx/trunk/test/std/experimental/filesystem/class.directory_entry/directory_entry.mods.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/experimental/filesystem/class.directory_entry/directory_entry.mods.pass.cpp?rev=328475&r1=328474&r2=328475&view=diff
==============================================================================
--- libcxx/trunk/test/std/experimental/filesystem/class.directory_entry/directory_entry.mods.pass.cpp (original)
+++ libcxx/trunk/test/std/experimental/filesystem/class.directory_entry/directory_entry.mods.pass.cpp Sun Mar 25 22:46:57 2018
@@ -18,11 +18,10 @@
// void assign(path const&);
// void replace_filename(path const&);
-#include <experimental/filesystem>
+#include "filesystem_include.hpp"
#include <type_traits>
#include <cassert>
-namespace fs = std::experimental::filesystem;
void test_copy_assign_operator()
{
Modified: libcxx/trunk/test/std/experimental/filesystem/class.directory_entry/directory_entry.obs/comparisons.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/experimental/filesystem/class.directory_entry/directory_entry.obs/comparisons.pass.cpp?rev=328475&r1=328474&r2=328475&view=diff
==============================================================================
--- libcxx/trunk/test/std/experimental/filesystem/class.directory_entry/directory_entry.obs/comparisons.pass.cpp (original)
+++ libcxx/trunk/test/std/experimental/filesystem/class.directory_entry/directory_entry.obs/comparisons.pass.cpp Sun Mar 25 22:46:57 2018
@@ -21,11 +21,10 @@
// bool operator>=(directory_entry const&) const noexcept;
-#include <experimental/filesystem>
+#include "filesystem_include.hpp"
#include <type_traits>
#include <cassert>
-namespace fs = std::experimental::filesystem;
#define CHECK_OP(Op) \
static_assert(std::is_same<decltype(ce. operator Op (ce)), bool>::value, ""); \
Modified: libcxx/trunk/test/std/experimental/filesystem/class.directory_entry/directory_entry.obs/path.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/experimental/filesystem/class.directory_entry/directory_entry.obs/path.pass.cpp?rev=328475&r1=328474&r2=328475&view=diff
==============================================================================
--- libcxx/trunk/test/std/experimental/filesystem/class.directory_entry/directory_entry.obs/path.pass.cpp (original)
+++ libcxx/trunk/test/std/experimental/filesystem/class.directory_entry/directory_entry.obs/path.pass.cpp Sun Mar 25 22:46:57 2018
@@ -16,11 +16,10 @@
// const path& path() const noexcept;
// operator const path&() const noexcept;
-#include <experimental/filesystem>
+#include "filesystem_include.hpp"
#include <type_traits>
#include <cassert>
-namespace fs = std::experimental::filesystem;
void test_path_method() {
using namespace fs;
Modified: libcxx/trunk/test/std/experimental/filesystem/class.directory_entry/directory_entry.obs/status.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/experimental/filesystem/class.directory_entry/directory_entry.obs/status.pass.cpp?rev=328475&r1=328474&r2=328475&view=diff
==============================================================================
--- libcxx/trunk/test/std/experimental/filesystem/class.directory_entry/directory_entry.obs/status.pass.cpp (original)
+++ libcxx/trunk/test/std/experimental/filesystem/class.directory_entry/directory_entry.obs/status.pass.cpp Sun Mar 25 22:46:57 2018
@@ -16,7 +16,7 @@
// file_status status() const;
// file_status status(error_code const&) const noexcept;
-#include <experimental/filesystem>
+#include "filesystem_include.hpp"
#include <type_traits>
#include <cassert>
Modified: libcxx/trunk/test/std/experimental/filesystem/class.directory_entry/directory_entry.obs/symlink_status.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/experimental/filesystem/class.directory_entry/directory_entry.obs/symlink_status.pass.cpp?rev=328475&r1=328474&r2=328475&view=diff
==============================================================================
--- libcxx/trunk/test/std/experimental/filesystem/class.directory_entry/directory_entry.obs/symlink_status.pass.cpp (original)
+++ libcxx/trunk/test/std/experimental/filesystem/class.directory_entry/directory_entry.obs/symlink_status.pass.cpp Sun Mar 25 22:46:57 2018
@@ -16,7 +16,7 @@
// file_status symlink_status() const;
// file_status symlink_status(error_code&) const noexcept;
-#include <experimental/filesystem>
+#include "filesystem_include.hpp"
#include <type_traits>
#include <cassert>
Modified: libcxx/trunk/test/std/experimental/filesystem/class.directory_iterator/directory_iterator.members/copy.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/experimental/filesystem/class.directory_iterator/directory_iterator.members/copy.pass.cpp?rev=328475&r1=328474&r2=328475&view=diff
==============================================================================
--- libcxx/trunk/test/std/experimental/filesystem/class.directory_iterator/directory_iterator.members/copy.pass.cpp (original)
+++ libcxx/trunk/test/std/experimental/filesystem/class.directory_iterator/directory_iterator.members/copy.pass.cpp Sun Mar 25 22:46:57 2018
@@ -15,7 +15,7 @@
// directory_iterator(directory_iterator const&);
-#include <experimental/filesystem>
+#include "filesystem_include.hpp"
#include <type_traits>
#include <set>
#include <cassert>
@@ -24,7 +24,7 @@
#include "rapid-cxx-test.hpp"
#include "filesystem_test_helper.hpp"
-using namespace std::experimental::filesystem;
+using namespace fs;
TEST_SUITE(directory_iterator_copy_construct_tests)
Modified: libcxx/trunk/test/std/experimental/filesystem/class.directory_iterator/directory_iterator.members/copy_assign.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/experimental/filesystem/class.directory_iterator/directory_iterator.members/copy_assign.pass.cpp?rev=328475&r1=328474&r2=328475&view=diff
==============================================================================
--- libcxx/trunk/test/std/experimental/filesystem/class.directory_iterator/directory_iterator.members/copy_assign.pass.cpp (original)
+++ libcxx/trunk/test/std/experimental/filesystem/class.directory_iterator/directory_iterator.members/copy_assign.pass.cpp Sun Mar 25 22:46:57 2018
@@ -15,7 +15,7 @@
// directory_iterator& operator=(directory_iterator const&);
-#include <experimental/filesystem>
+#include "filesystem_include.hpp"
#include <type_traits>
#include <set>
#include <cassert>
@@ -24,7 +24,7 @@
#include "rapid-cxx-test.hpp"
#include "filesystem_test_helper.hpp"
-using namespace std::experimental::filesystem;
+using namespace fs;
TEST_SUITE(directory_iterator_copy_assign_tests)
Modified: libcxx/trunk/test/std/experimental/filesystem/class.directory_iterator/directory_iterator.members/ctor.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/experimental/filesystem/class.directory_iterator/directory_iterator.members/ctor.pass.cpp?rev=328475&r1=328474&r2=328475&view=diff
==============================================================================
--- libcxx/trunk/test/std/experimental/filesystem/class.directory_iterator/directory_iterator.members/ctor.pass.cpp (original)
+++ libcxx/trunk/test/std/experimental/filesystem/class.directory_iterator/directory_iterator.members/ctor.pass.cpp Sun Mar 25 22:46:57 2018
@@ -18,7 +18,7 @@
// directory_iterator(const path& p, error_code& ec);
// directory_iterator(const path& p, directory_options options, error_code& ec);
-#include <experimental/filesystem>
+#include "filesystem_include.hpp"
#include <type_traits>
#include <set>
#include <cassert>
@@ -27,7 +27,7 @@
#include "rapid-cxx-test.hpp"
#include "filesystem_test_helper.hpp"
-using namespace std::experimental::filesystem;
+using namespace fs;
TEST_SUITE(directory_iterator_constructor_tests)
@@ -86,7 +86,7 @@ TEST_CASE(test_construction_from_bad_pat
TEST_CASE(access_denied_test_case)
{
- using namespace std::experimental::filesystem;
+ using namespace fs;
scoped_test_env env;
path const testDir = env.make_env_path("dir1");
path const testFile = testDir / "testFile";
@@ -122,7 +122,7 @@ TEST_CASE(access_denied_test_case)
TEST_CASE(access_denied_to_file_test_case)
{
- using namespace std::experimental::filesystem;
+ using namespace fs;
scoped_test_env env;
path const testFile = env.make_env_path("file1");
env.create_file(testFile, 42);
Modified: libcxx/trunk/test/std/experimental/filesystem/class.directory_iterator/directory_iterator.members/default_ctor.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/experimental/filesystem/class.directory_iterator/directory_iterator.members/default_ctor.pass.cpp?rev=328475&r1=328474&r2=328475&view=diff
==============================================================================
--- libcxx/trunk/test/std/experimental/filesystem/class.directory_iterator/directory_iterator.members/default_ctor.pass.cpp (original)
+++ libcxx/trunk/test/std/experimental/filesystem/class.directory_iterator/directory_iterator.members/default_ctor.pass.cpp Sun Mar 25 22:46:57 2018
@@ -16,13 +16,12 @@
// directory_iterator::directory_iterator() noexcept
-#include <experimental/filesystem>
+#include "filesystem_include.hpp"
#include <type_traits>
#include <cassert>
#include "test_macros.h"
-namespace fs = std::experimental::filesystem;
int main() {
{
Modified: libcxx/trunk/test/std/experimental/filesystem/class.directory_iterator/directory_iterator.members/increment.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/experimental/filesystem/class.directory_iterator/directory_iterator.members/increment.pass.cpp?rev=328475&r1=328474&r2=328475&view=diff
==============================================================================
--- libcxx/trunk/test/std/experimental/filesystem/class.directory_iterator/directory_iterator.members/increment.pass.cpp (original)
+++ libcxx/trunk/test/std/experimental/filesystem/class.directory_iterator/directory_iterator.members/increment.pass.cpp Sun Mar 25 22:46:57 2018
@@ -16,7 +16,7 @@
// directory_iterator& operator++();
// directory_iterator& increment(error_code& ec);
-#include <experimental/filesystem>
+#include "filesystem_include.hpp"
#include <type_traits>
#include <set>
#include <cassert>
@@ -26,7 +26,7 @@
#include "filesystem_test_helper.hpp"
#include <iostream>
-using namespace std::experimental::filesystem;
+using namespace fs;
TEST_SUITE(directory_iterator_increment_tests)
Modified: libcxx/trunk/test/std/experimental/filesystem/class.directory_iterator/directory_iterator.members/move.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/experimental/filesystem/class.directory_iterator/directory_iterator.members/move.pass.cpp?rev=328475&r1=328474&r2=328475&view=diff
==============================================================================
--- libcxx/trunk/test/std/experimental/filesystem/class.directory_iterator/directory_iterator.members/move.pass.cpp (original)
+++ libcxx/trunk/test/std/experimental/filesystem/class.directory_iterator/directory_iterator.members/move.pass.cpp Sun Mar 25 22:46:57 2018
@@ -15,7 +15,7 @@
// directory_iterator(directory_iterator&&) noexcept;
-#include <experimental/filesystem>
+#include "filesystem_include.hpp"
#include <type_traits>
#include <set>
#include <cassert>
@@ -24,7 +24,7 @@
#include "rapid-cxx-test.hpp"
#include "filesystem_test_helper.hpp"
-using namespace std::experimental::filesystem;
+using namespace fs;
TEST_SUITE(directory_iterator_move_construct_tests)
Modified: libcxx/trunk/test/std/experimental/filesystem/class.directory_iterator/directory_iterator.members/move_assign.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/experimental/filesystem/class.directory_iterator/directory_iterator.members/move_assign.pass.cpp?rev=328475&r1=328474&r2=328475&view=diff
==============================================================================
--- libcxx/trunk/test/std/experimental/filesystem/class.directory_iterator/directory_iterator.members/move_assign.pass.cpp (original)
+++ libcxx/trunk/test/std/experimental/filesystem/class.directory_iterator/directory_iterator.members/move_assign.pass.cpp Sun Mar 25 22:46:57 2018
@@ -15,7 +15,7 @@
// directory_iterator& operator=(directory_iterator const&);
-#include <experimental/filesystem>
+#include "filesystem_include.hpp"
#include <type_traits>
#include <set>
#include <cassert>
@@ -30,7 +30,7 @@
#pragma clang diagnostic ignored "-Wself-move"
#endif
-using namespace std::experimental::filesystem;
+using namespace fs;
TEST_SUITE(directory_iterator_move_assign_tests)
Modified: libcxx/trunk/test/std/experimental/filesystem/class.directory_iterator/directory_iterator.nonmembers/begin_end.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/experimental/filesystem/class.directory_iterator/directory_iterator.nonmembers/begin_end.pass.cpp?rev=328475&r1=328474&r2=328475&view=diff
==============================================================================
--- libcxx/trunk/test/std/experimental/filesystem/class.directory_iterator/directory_iterator.nonmembers/begin_end.pass.cpp (original)
+++ libcxx/trunk/test/std/experimental/filesystem/class.directory_iterator/directory_iterator.nonmembers/begin_end.pass.cpp Sun Mar 25 22:46:57 2018
@@ -16,7 +16,7 @@
// directory_iterator begin(directory_iterator iter) noexcept;
// directory_iterator end(directory_iterator iter) noexcept;
-#include <experimental/filesystem>
+#include "filesystem_include.hpp"
#include <type_traits>
#include <set>
#include <cassert>
@@ -26,7 +26,7 @@
#include "filesystem_test_helper.hpp"
#include <iostream>
-using namespace std::experimental::filesystem;
+using namespace fs;
TEST_SUITE(directory_iterator_begin_end_tests)
Modified: libcxx/trunk/test/std/experimental/filesystem/class.directory_iterator/types.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/experimental/filesystem/class.directory_iterator/types.pass.cpp?rev=328475&r1=328474&r2=328475&view=diff
==============================================================================
--- libcxx/trunk/test/std/experimental/filesystem/class.directory_iterator/types.pass.cpp (original)
+++ libcxx/trunk/test/std/experimental/filesystem/class.directory_iterator/types.pass.cpp Sun Mar 25 22:46:57 2018
@@ -19,13 +19,12 @@
// typedef ... reference;
// typedef ... iterator_category
-#include <experimental/filesystem>
+#include "filesystem_include.hpp"
#include <type_traits>
#include <cassert>
#include "test_macros.h"
-namespace fs = std::experimental::filesystem;
int main() {
using namespace fs;
Modified: libcxx/trunk/test/std/experimental/filesystem/class.file_status/file_status.cons.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/experimental/filesystem/class.file_status/file_status.cons.pass.cpp?rev=328475&r1=328474&r2=328475&view=diff
==============================================================================
--- libcxx/trunk/test/std/experimental/filesystem/class.file_status/file_status.cons.pass.cpp (original)
+++ libcxx/trunk/test/std/experimental/filesystem/class.file_status/file_status.cons.pass.cpp Sun Mar 25 22:46:57 2018
@@ -16,13 +16,12 @@
// explicit file_status() noexcept;
// explicit file_status(file_type, perms prms = perms::unknown) noexcept;
-#include <experimental/filesystem>
+#include "filesystem_include.hpp"
#include <type_traits>
#include <cassert>
#include "test_convertible.hpp"
-namespace fs = std::experimental::filesystem;
int main() {
using namespace fs;
Modified: libcxx/trunk/test/std/experimental/filesystem/class.file_status/file_status.mods.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/experimental/filesystem/class.file_status/file_status.mods.pass.cpp?rev=328475&r1=328474&r2=328475&view=diff
==============================================================================
--- libcxx/trunk/test/std/experimental/filesystem/class.file_status/file_status.mods.pass.cpp (original)
+++ libcxx/trunk/test/std/experimental/filesystem/class.file_status/file_status.mods.pass.cpp Sun Mar 25 22:46:57 2018
@@ -16,11 +16,10 @@
// void type(file_type) noexcept;
// void permissions(perms) noexcept;
-#include <experimental/filesystem>
+#include "filesystem_include.hpp"
#include <type_traits>
#include <cassert>
-namespace fs = std::experimental::filesystem;
int main() {
using namespace fs;
Modified: libcxx/trunk/test/std/experimental/filesystem/class.file_status/file_status.obs.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/experimental/filesystem/class.file_status/file_status.obs.pass.cpp?rev=328475&r1=328474&r2=328475&view=diff
==============================================================================
--- libcxx/trunk/test/std/experimental/filesystem/class.file_status/file_status.obs.pass.cpp (original)
+++ libcxx/trunk/test/std/experimental/filesystem/class.file_status/file_status.obs.pass.cpp Sun Mar 25 22:46:57 2018
@@ -16,11 +16,10 @@
// file_type type() const noexcept;
// perms permissions(p) const noexcept;
-#include <experimental/filesystem>
+#include "filesystem_include.hpp"
#include <type_traits>
#include <cassert>
-namespace fs = std::experimental::filesystem;
int main() {
using namespace fs;
Modified: libcxx/trunk/test/std/experimental/filesystem/class.filesystem_error/filesystem_error.members.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/experimental/filesystem/class.filesystem_error/filesystem_error.members.pass.cpp?rev=328475&r1=328474&r2=328475&view=diff
==============================================================================
--- libcxx/trunk/test/std/experimental/filesystem/class.filesystem_error/filesystem_error.members.pass.cpp (original)
+++ libcxx/trunk/test/std/experimental/filesystem/class.filesystem_error/filesystem_error.members.pass.cpp Sun Mar 25 22:46:57 2018
@@ -21,13 +21,12 @@
// const path& path1() const noexcept;
// const path& path2() const noexcept;
-#include <experimental/filesystem>
+#include "filesystem_include.hpp"
#include <type_traits>
#include <cassert>
#include "test_macros.h"
-namespace fs = std::experimental::filesystem;
void test_constructors() {
using namespace fs;
Modified: libcxx/trunk/test/std/experimental/filesystem/class.path/path.itr/iterator.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/experimental/filesystem/class.path/path.itr/iterator.pass.cpp?rev=328475&r1=328474&r2=328475&view=diff
==============================================================================
--- libcxx/trunk/test/std/experimental/filesystem/class.path/path.itr/iterator.pass.cpp (original)
+++ libcxx/trunk/test/std/experimental/filesystem/class.path/path.itr/iterator.pass.cpp Sun Mar 25 22:46:57 2018
@@ -19,7 +19,7 @@
// path(InputIterator first, InputIterator last);
-#include <experimental/filesystem>
+#include "filesystem_include.hpp"
#include <iterator>
#include <type_traits>
#include <cassert>
@@ -27,7 +27,6 @@
#include "test_macros.h"
#include "filesystem_test_helper.hpp"
-namespace fs = std::experimental::filesystem;
template <class It>
Modified: libcxx/trunk/test/std/experimental/filesystem/class.path/path.member/path.append.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/experimental/filesystem/class.path/path.member/path.append.pass.cpp?rev=328475&r1=328474&r2=328475&view=diff
==============================================================================
--- libcxx/trunk/test/std/experimental/filesystem/class.path/path.member/path.append.pass.cpp (original)
+++ libcxx/trunk/test/std/experimental/filesystem/class.path/path.member/path.append.pass.cpp Sun Mar 25 22:46:57 2018
@@ -22,7 +22,7 @@
// path& append(InputIterator first, InputIterator last);
-#include <experimental/filesystem>
+#include "filesystem_include.hpp"
#include <type_traits>
#include <string_view>
#include <cassert>
@@ -32,7 +32,6 @@
#include "count_new.hpp"
#include "filesystem_test_helper.hpp"
-namespace fs = std::experimental::filesystem;
struct AppendOperatorTestcase {
MultiStringType lhs;
Modified: libcxx/trunk/test/std/experimental/filesystem/class.path/path.member/path.assign/braced_init.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/experimental/filesystem/class.path/path.member/path.assign/braced_init.pass.cpp?rev=328475&r1=328474&r2=328475&view=diff
==============================================================================
--- libcxx/trunk/test/std/experimental/filesystem/class.path/path.member/path.assign/braced_init.pass.cpp (original)
+++ libcxx/trunk/test/std/experimental/filesystem/class.path/path.member/path.assign/braced_init.pass.cpp Sun Mar 25 22:46:57 2018
@@ -15,14 +15,13 @@
// path& operator=(path const&);
-#include <experimental/filesystem>
+#include "filesystem_include.hpp"
#include <type_traits>
#include <cassert>
#include "test_macros.h"
#include "count_new.hpp"
-namespace fs = std::experimental::filesystem;
int main() {
using namespace fs;
Modified: libcxx/trunk/test/std/experimental/filesystem/class.path/path.member/path.assign/copy.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/experimental/filesystem/class.path/path.member/path.assign/copy.pass.cpp?rev=328475&r1=328474&r2=328475&view=diff
==============================================================================
--- libcxx/trunk/test/std/experimental/filesystem/class.path/path.member/path.assign/copy.pass.cpp (original)
+++ libcxx/trunk/test/std/experimental/filesystem/class.path/path.member/path.assign/copy.pass.cpp Sun Mar 25 22:46:57 2018
@@ -15,13 +15,12 @@
// path& operator=(path const&);
-#include <experimental/filesystem>
+#include "filesystem_include.hpp"
#include <type_traits>
#include <cassert>
#include "test_macros.h"
-namespace fs = std::experimental::filesystem;
int main() {
using namespace fs;
Modified: libcxx/trunk/test/std/experimental/filesystem/class.path/path.member/path.assign/move.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/experimental/filesystem/class.path/path.member/path.assign/move.pass.cpp?rev=328475&r1=328474&r2=328475&view=diff
==============================================================================
--- libcxx/trunk/test/std/experimental/filesystem/class.path/path.member/path.assign/move.pass.cpp (original)
+++ libcxx/trunk/test/std/experimental/filesystem/class.path/path.member/path.assign/move.pass.cpp Sun Mar 25 22:46:57 2018
@@ -15,14 +15,13 @@
// path& operator=(path&&) noexcept
-#include <experimental/filesystem>
+#include "filesystem_include.hpp"
#include <type_traits>
#include <cassert>
#include "test_macros.h"
#include "count_new.hpp"
-namespace fs = std::experimental::filesystem;
int main() {
using namespace fs;
Modified: libcxx/trunk/test/std/experimental/filesystem/class.path/path.member/path.assign/source.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/experimental/filesystem/class.path/path.member/path.assign/source.pass.cpp?rev=328475&r1=328474&r2=328475&view=diff
==============================================================================
--- libcxx/trunk/test/std/experimental/filesystem/class.path/path.member/path.assign/source.pass.cpp (original)
+++ libcxx/trunk/test/std/experimental/filesystem/class.path/path.member/path.assign/source.pass.cpp Sun Mar 25 22:46:57 2018
@@ -22,7 +22,7 @@
// path& assign(InputIterator first, InputIterator last);
-#include <experimental/filesystem>
+#include "filesystem_include.hpp"
#include <type_traits>
#include <string_view>
#include <cassert>
@@ -33,7 +33,6 @@
#include "filesystem_test_helper.hpp"
#include <iostream>
-namespace fs = std::experimental::filesystem;
template <class CharT>
void RunTestCase(MultiStringType const& MS) {
Modified: libcxx/trunk/test/std/experimental/filesystem/class.path/path.member/path.compare.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/experimental/filesystem/class.path/path.member/path.compare.pass.cpp?rev=328475&r1=328474&r2=328475&view=diff
==============================================================================
--- libcxx/trunk/test/std/experimental/filesystem/class.path/path.member/path.compare.pass.cpp (original)
+++ libcxx/trunk/test/std/experimental/filesystem/class.path/path.member/path.compare.pass.cpp Sun Mar 25 22:46:57 2018
@@ -26,7 +26,7 @@
//
// size_t hash_value(path const&) noexcept;
-#include <experimental/filesystem>
+#include "filesystem_include.hpp"
#include <type_traits>
#include <vector>
#include <cassert>
@@ -36,7 +36,6 @@
#include "count_new.hpp"
#include "filesystem_test_helper.hpp"
-namespace fs = std::experimental::filesystem;
struct PathCompareTest {
const char* LHS;
Modified: libcxx/trunk/test/std/experimental/filesystem/class.path/path.member/path.concat.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/experimental/filesystem/class.path/path.member/path.concat.pass.cpp?rev=328475&r1=328474&r2=328475&view=diff
==============================================================================
--- libcxx/trunk/test/std/experimental/filesystem/class.path/path.member/path.concat.pass.cpp (original)
+++ libcxx/trunk/test/std/experimental/filesystem/class.path/path.member/path.concat.pass.cpp Sun Mar 25 22:46:57 2018
@@ -28,7 +28,7 @@
// path& concat(InputIterator first, InputIterator last);
-#include <experimental/filesystem>
+#include "filesystem_include.hpp"
#include <type_traits>
#include <string>
#include <string_view>
@@ -39,7 +39,6 @@
#include "count_new.hpp"
#include "filesystem_test_helper.hpp"
-namespace fs = std::experimental::filesystem;
struct ConcatOperatorTestcase {
MultiStringType lhs;
Modified: libcxx/trunk/test/std/experimental/filesystem/class.path/path.member/path.construct/copy.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/experimental/filesystem/class.path/path.member/path.construct/copy.pass.cpp?rev=328475&r1=328474&r2=328475&view=diff
==============================================================================
--- libcxx/trunk/test/std/experimental/filesystem/class.path/path.member/path.construct/copy.pass.cpp (original)
+++ libcxx/trunk/test/std/experimental/filesystem/class.path/path.member/path.construct/copy.pass.cpp Sun Mar 25 22:46:57 2018
@@ -15,13 +15,12 @@
// path(path const&)
-#include <experimental/filesystem>
+#include "filesystem_include.hpp"
#include <type_traits>
#include <cassert>
#include "test_macros.h"
-namespace fs = std::experimental::filesystem;
int main() {
using namespace fs;
Modified: libcxx/trunk/test/std/experimental/filesystem/class.path/path.member/path.construct/default.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/experimental/filesystem/class.path/path.member/path.construct/default.pass.cpp?rev=328475&r1=328474&r2=328475&view=diff
==============================================================================
--- libcxx/trunk/test/std/experimental/filesystem/class.path/path.member/path.construct/default.pass.cpp (original)
+++ libcxx/trunk/test/std/experimental/filesystem/class.path/path.member/path.construct/default.pass.cpp Sun Mar 25 22:46:57 2018
@@ -15,13 +15,12 @@
// path() noexcept
-#include <experimental/filesystem>
+#include "filesystem_include.hpp"
#include <type_traits>
#include <cassert>
#include "test_macros.h"
-namespace fs = std::experimental::filesystem;
int main() {
using namespace fs;
Modified: libcxx/trunk/test/std/experimental/filesystem/class.path/path.member/path.construct/move.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/experimental/filesystem/class.path/path.member/path.construct/move.pass.cpp?rev=328475&r1=328474&r2=328475&view=diff
==============================================================================
--- libcxx/trunk/test/std/experimental/filesystem/class.path/path.member/path.construct/move.pass.cpp (original)
+++ libcxx/trunk/test/std/experimental/filesystem/class.path/path.member/path.construct/move.pass.cpp Sun Mar 25 22:46:57 2018
@@ -15,14 +15,13 @@
// path(path&&) noexcept
-#include <experimental/filesystem>
+#include "filesystem_include.hpp"
#include <type_traits>
#include <cassert>
#include "test_macros.h"
#include "count_new.hpp"
-namespace fs = std::experimental::filesystem;
int main() {
using namespace fs;
Modified: libcxx/trunk/test/std/experimental/filesystem/class.path/path.member/path.construct/source.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/experimental/filesystem/class.path/path.member/path.construct/source.pass.cpp?rev=328475&r1=328474&r2=328475&view=diff
==============================================================================
--- libcxx/trunk/test/std/experimental/filesystem/class.path/path.member/path.construct/source.pass.cpp (original)
+++ libcxx/trunk/test/std/experimental/filesystem/class.path/path.member/path.construct/source.pass.cpp Sun Mar 25 22:46:57 2018
@@ -19,7 +19,7 @@
// path(InputIterator first, InputIterator last);
-#include <experimental/filesystem>
+#include "filesystem_include.hpp"
#include <type_traits>
#include <cassert>
@@ -28,7 +28,6 @@
#include "min_allocator.h"
#include "filesystem_test_helper.hpp"
-namespace fs = std::experimental::filesystem;
template <class CharT>
void RunTestCase(MultiStringType const& MS) {
Modified: libcxx/trunk/test/std/experimental/filesystem/class.path/path.member/path.decompose/empty.fail.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/experimental/filesystem/class.path/path.member/path.decompose/empty.fail.cpp?rev=328475&r1=328474&r2=328475&view=diff
==============================================================================
--- libcxx/trunk/test/std/experimental/filesystem/class.path/path.member/path.decompose/empty.fail.cpp (original)
+++ libcxx/trunk/test/std/experimental/filesystem/class.path/path.member/path.decompose/empty.fail.cpp Sun Mar 25 22:46:57 2018
@@ -17,12 +17,11 @@
// UNSUPPORTED: c++98, c++03, c++11, c++14, c++17
// UNSUPPORTED: clang-3.3, clang-3.4, clang-3.5, clang-3.6, clang-3.7, clang-3.8
-#include <experimental/filesystem>
-
+#include "filesystem_include.hpp"
#include "test_macros.h"
int main ()
{
- std::experimental::filesystem::path c;
+ fs::path c;
c.empty(); // expected-error {{ignoring return value of function declared with 'nodiscard' attribute}}
}
Modified: libcxx/trunk/test/std/experimental/filesystem/class.path/path.member/path.decompose/path.decompose.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/experimental/filesystem/class.path/path.member/path.decompose/path.decompose.pass.cpp?rev=328475&r1=328474&r2=328475&view=diff
==============================================================================
--- libcxx/trunk/test/std/experimental/filesystem/class.path/path.member/path.decompose/path.decompose.pass.cpp (original)
+++ libcxx/trunk/test/std/experimental/filesystem/class.path/path.member/path.decompose/path.decompose.pass.cpp Sun Mar 25 22:46:57 2018
@@ -44,7 +44,7 @@
// iterator end() const;
-#include <experimental/filesystem>
+#include "filesystem_include.hpp"
#include <type_traits>
#include <vector>
#include <cassert>
@@ -54,7 +54,6 @@
#include "count_new.hpp"
#include "filesystem_test_helper.hpp"
-namespace fs = std::experimental::filesystem;
struct PathDecomposeTestcase
{
std::string raw;
Modified: libcxx/trunk/test/std/experimental/filesystem/class.path/path.member/path.generic.obs/generic_string_alloc.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/experimental/filesystem/class.path/path.member/path.generic.obs/generic_string_alloc.pass.cpp?rev=328475&r1=328474&r2=328475&view=diff
==============================================================================
--- libcxx/trunk/test/std/experimental/filesystem/class.path/path.member/path.generic.obs/generic_string_alloc.pass.cpp (original)
+++ libcxx/trunk/test/std/experimental/filesystem/class.path/path.member/path.generic.obs/generic_string_alloc.pass.cpp Sun Mar 25 22:46:57 2018
@@ -18,7 +18,7 @@
// basic_string<ECharT, Traits, Allocator>
// generic_string(const Allocator& a = Allocator()) const;
-#include <experimental/filesystem>
+#include "filesystem_include.hpp"
#include <type_traits>
#include <cassert>
@@ -28,7 +28,6 @@
#include "min_allocator.h"
#include "filesystem_test_helper.hpp"
-namespace fs = std::experimental::filesystem;
MultiStringType longString = MKSTR("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ/123456789/abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ");
Modified: libcxx/trunk/test/std/experimental/filesystem/class.path/path.member/path.generic.obs/named_overloads.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/experimental/filesystem/class.path/path.member/path.generic.obs/named_overloads.pass.cpp?rev=328475&r1=328474&r2=328475&view=diff
==============================================================================
--- libcxx/trunk/test/std/experimental/filesystem/class.path/path.member/path.generic.obs/named_overloads.pass.cpp (original)
+++ libcxx/trunk/test/std/experimental/filesystem/class.path/path.member/path.generic.obs/named_overloads.pass.cpp Sun Mar 25 22:46:57 2018
@@ -20,7 +20,7 @@
// std::u32string generic_u32string() const;
-#include <experimental/filesystem>
+#include "filesystem_include.hpp"
#include <type_traits>
#include <cassert>
@@ -30,7 +30,6 @@
#include "min_allocator.h"
#include "filesystem_test_helper.hpp"
-namespace fs = std::experimental::filesystem;
MultiStringType longString = MKSTR("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ/123456789/abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ");
Modified: libcxx/trunk/test/std/experimental/filesystem/class.path/path.member/path.modifiers/clear.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/experimental/filesystem/class.path/path.member/path.modifiers/clear.pass.cpp?rev=328475&r1=328474&r2=328475&view=diff
==============================================================================
--- libcxx/trunk/test/std/experimental/filesystem/class.path/path.member/path.modifiers/clear.pass.cpp (original)
+++ libcxx/trunk/test/std/experimental/filesystem/class.path/path.member/path.modifiers/clear.pass.cpp Sun Mar 25 22:46:57 2018
@@ -15,7 +15,7 @@
// void clear() noexcept
-#include <experimental/filesystem>
+#include "filesystem_include.hpp"
#include <type_traits>
#include <cassert>
@@ -24,7 +24,6 @@
#include "count_new.hpp"
#include "filesystem_test_helper.hpp"
-namespace fs = std::experimental::filesystem;
int main() {
using namespace fs;
Modified: libcxx/trunk/test/std/experimental/filesystem/class.path/path.member/path.modifiers/make_preferred.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/experimental/filesystem/class.path/path.member/path.modifiers/make_preferred.pass.cpp?rev=328475&r1=328474&r2=328475&view=diff
==============================================================================
--- libcxx/trunk/test/std/experimental/filesystem/class.path/path.member/path.modifiers/make_preferred.pass.cpp (original)
+++ libcxx/trunk/test/std/experimental/filesystem/class.path/path.member/path.modifiers/make_preferred.pass.cpp Sun Mar 25 22:46:57 2018
@@ -15,7 +15,7 @@
// path& make_preferred()
-#include <experimental/filesystem>
+#include "filesystem_include.hpp"
#include <type_traits>
#include <cassert>
@@ -24,7 +24,6 @@
#include "count_new.hpp"
#include "filesystem_test_helper.hpp"
-namespace fs = std::experimental::filesystem;
struct MakePreferredTestcase {
const char* value;
Modified: libcxx/trunk/test/std/experimental/filesystem/class.path/path.member/path.modifiers/remove_filename.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/experimental/filesystem/class.path/path.member/path.modifiers/remove_filename.pass.cpp?rev=328475&r1=328474&r2=328475&view=diff
==============================================================================
--- libcxx/trunk/test/std/experimental/filesystem/class.path/path.member/path.modifiers/remove_filename.pass.cpp (original)
+++ libcxx/trunk/test/std/experimental/filesystem/class.path/path.member/path.modifiers/remove_filename.pass.cpp Sun Mar 25 22:46:57 2018
@@ -15,7 +15,7 @@
// path& remove_filename()
-#include <experimental/filesystem>
+#include "filesystem_include.hpp"
#include <type_traits>
#include <cassert>
@@ -24,7 +24,6 @@
#include "count_new.hpp"
#include "filesystem_test_helper.hpp"
-namespace fs = std::experimental::filesystem;
struct RemoveFilenameTestcase {
const char* value;
Modified: libcxx/trunk/test/std/experimental/filesystem/class.path/path.member/path.modifiers/replace_extension.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/experimental/filesystem/class.path/path.member/path.modifiers/replace_extension.pass.cpp?rev=328475&r1=328474&r2=328475&view=diff
==============================================================================
--- libcxx/trunk/test/std/experimental/filesystem/class.path/path.member/path.modifiers/replace_extension.pass.cpp (original)
+++ libcxx/trunk/test/std/experimental/filesystem/class.path/path.member/path.modifiers/replace_extension.pass.cpp Sun Mar 25 22:46:57 2018
@@ -15,7 +15,7 @@
// path& replace_extension(path const& p = path())
-#include <experimental/filesystem>
+#include "filesystem_include.hpp"
#include <type_traits>
#include <cassert>
@@ -24,7 +24,6 @@
#include "count_new.hpp"
#include "filesystem_test_helper.hpp"
-namespace fs = std::experimental::filesystem;
struct ReplaceExtensionTestcase {
const char* value;
Modified: libcxx/trunk/test/std/experimental/filesystem/class.path/path.member/path.modifiers/replace_filename.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/experimental/filesystem/class.path/path.member/path.modifiers/replace_filename.pass.cpp?rev=328475&r1=328474&r2=328475&view=diff
==============================================================================
--- libcxx/trunk/test/std/experimental/filesystem/class.path/path.member/path.modifiers/replace_filename.pass.cpp (original)
+++ libcxx/trunk/test/std/experimental/filesystem/class.path/path.member/path.modifiers/replace_filename.pass.cpp Sun Mar 25 22:46:57 2018
@@ -15,7 +15,7 @@
// path& replace_filename()
-#include <experimental/filesystem>
+#include "filesystem_include.hpp"
#include <type_traits>
#include <cassert>
@@ -24,7 +24,6 @@
#include "count_new.hpp"
#include "filesystem_test_helper.hpp"
-namespace fs = std::experimental::filesystem;
struct ReplaceFilenameTestcase {
const char* value;
Modified: libcxx/trunk/test/std/experimental/filesystem/class.path/path.member/path.modifiers/swap.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/experimental/filesystem/class.path/path.member/path.modifiers/swap.pass.cpp?rev=328475&r1=328474&r2=328475&view=diff
==============================================================================
--- libcxx/trunk/test/std/experimental/filesystem/class.path/path.member/path.modifiers/swap.pass.cpp (original)
+++ libcxx/trunk/test/std/experimental/filesystem/class.path/path.member/path.modifiers/swap.pass.cpp Sun Mar 25 22:46:57 2018
@@ -15,7 +15,7 @@
// void swap(path& rhs) noexcept;
-#include <experimental/filesystem>
+#include "filesystem_include.hpp"
#include <type_traits>
#include <cassert>
@@ -24,7 +24,6 @@
#include "count_new.hpp"
#include "filesystem_test_helper.hpp"
-namespace fs = std::experimental::filesystem;
struct SwapTestcase {
const char* value1;
Modified: libcxx/trunk/test/std/experimental/filesystem/class.path/path.member/path.native.obs/c_str.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/experimental/filesystem/class.path/path.member/path.native.obs/c_str.pass.cpp?rev=328475&r1=328474&r2=328475&view=diff
==============================================================================
--- libcxx/trunk/test/std/experimental/filesystem/class.path/path.member/path.native.obs/c_str.pass.cpp (original)
+++ libcxx/trunk/test/std/experimental/filesystem/class.path/path.member/path.native.obs/c_str.pass.cpp Sun Mar 25 22:46:57 2018
@@ -16,14 +16,13 @@
// const value_type* c_str() const noexcept;
-#include <experimental/filesystem>
+#include "filesystem_include.hpp"
#include <type_traits>
#include <cassert>
#include "test_macros.h"
#include "filesystem_test_helper.hpp"
-namespace fs = std::experimental::filesystem;
int main()
{
Modified: libcxx/trunk/test/std/experimental/filesystem/class.path/path.member/path.native.obs/named_overloads.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/experimental/filesystem/class.path/path.member/path.native.obs/named_overloads.pass.cpp?rev=328475&r1=328474&r2=328475&view=diff
==============================================================================
--- libcxx/trunk/test/std/experimental/filesystem/class.path/path.member/path.native.obs/named_overloads.pass.cpp (original)
+++ libcxx/trunk/test/std/experimental/filesystem/class.path/path.member/path.native.obs/named_overloads.pass.cpp Sun Mar 25 22:46:57 2018
@@ -20,7 +20,7 @@
// std::u32string u32string() const;
-#include <experimental/filesystem>
+#include "filesystem_include.hpp"
#include <type_traits>
#include <cassert>
@@ -30,7 +30,6 @@
#include "min_allocator.h"
#include "filesystem_test_helper.hpp"
-namespace fs = std::experimental::filesystem;
MultiStringType longString = MKSTR("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ/123456789/abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ");
Modified: libcxx/trunk/test/std/experimental/filesystem/class.path/path.member/path.native.obs/native.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/experimental/filesystem/class.path/path.member/path.native.obs/native.pass.cpp?rev=328475&r1=328474&r2=328475&view=diff
==============================================================================
--- libcxx/trunk/test/std/experimental/filesystem/class.path/path.member/path.native.obs/native.pass.cpp (original)
+++ libcxx/trunk/test/std/experimental/filesystem/class.path/path.member/path.native.obs/native.pass.cpp Sun Mar 25 22:46:57 2018
@@ -15,14 +15,13 @@
// const string_type& native() const noexcept;
-#include <experimental/filesystem>
+#include "filesystem_include.hpp"
#include <type_traits>
#include <cassert>
#include "test_macros.h"
#include "filesystem_test_helper.hpp"
-namespace fs = std::experimental::filesystem;
int main()
{
Modified: libcxx/trunk/test/std/experimental/filesystem/class.path/path.member/path.native.obs/operator_string.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/experimental/filesystem/class.path/path.member/path.native.obs/operator_string.pass.cpp?rev=328475&r1=328474&r2=328475&view=diff
==============================================================================
--- libcxx/trunk/test/std/experimental/filesystem/class.path/path.member/path.native.obs/operator_string.pass.cpp (original)
+++ libcxx/trunk/test/std/experimental/filesystem/class.path/path.member/path.native.obs/operator_string.pass.cpp Sun Mar 25 22:46:57 2018
@@ -16,14 +16,13 @@
// operator string_type() const;
-#include <experimental/filesystem>
+#include "filesystem_include.hpp"
#include <type_traits>
#include <cassert>
#include "test_macros.h"
#include "filesystem_test_helper.hpp"
-namespace fs = std::experimental::filesystem;
int main()
{
Modified: libcxx/trunk/test/std/experimental/filesystem/class.path/path.member/path.native.obs/string_alloc.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/experimental/filesystem/class.path/path.member/path.native.obs/string_alloc.pass.cpp?rev=328475&r1=328474&r2=328475&view=diff
==============================================================================
--- libcxx/trunk/test/std/experimental/filesystem/class.path/path.member/path.native.obs/string_alloc.pass.cpp (original)
+++ libcxx/trunk/test/std/experimental/filesystem/class.path/path.member/path.native.obs/string_alloc.pass.cpp Sun Mar 25 22:46:57 2018
@@ -18,7 +18,7 @@
// basic_string<ECharT, Traits, Allocator>
// string(const Allocator& a = Allocator()) const;
-#include <experimental/filesystem>
+#include "filesystem_include.hpp"
#include <type_traits>
#include <cassert>
@@ -28,7 +28,6 @@
#include "min_allocator.h"
#include "filesystem_test_helper.hpp"
-namespace fs = std::experimental::filesystem;
// the SSO is always triggered for strings of size 2.
MultiStringType shortString = MKSTR("a");
Modified: libcxx/trunk/test/std/experimental/filesystem/class.path/path.nonmember/append_op.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/experimental/filesystem/class.path/path.nonmember/append_op.pass.cpp?rev=328475&r1=328474&r2=328475&view=diff
==============================================================================
--- libcxx/trunk/test/std/experimental/filesystem/class.path/path.nonmember/append_op.pass.cpp (original)
+++ libcxx/trunk/test/std/experimental/filesystem/class.path/path.nonmember/append_op.pass.cpp Sun Mar 25 22:46:57 2018
@@ -13,14 +13,13 @@
// path operator/(path const&, path const&);
-#include <experimental/filesystem>
+#include "filesystem_include.hpp"
#include <type_traits>
#include <cassert>
#include "test_macros.h"
#include "filesystem_test_helper.hpp"
-namespace fs = std::experimental::filesystem;
// This is mainly tested via the member append functions.
int main()
Modified: libcxx/trunk/test/std/experimental/filesystem/class.path/path.nonmember/path.factory.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/experimental/filesystem/class.path/path.nonmember/path.factory.pass.cpp?rev=328475&r1=328474&r2=328475&view=diff
==============================================================================
--- libcxx/trunk/test/std/experimental/filesystem/class.path/path.nonmember/path.factory.pass.cpp (original)
+++ libcxx/trunk/test/std/experimental/filesystem/class.path/path.nonmember/path.factory.pass.cpp Sun Mar 25 22:46:57 2018
@@ -16,7 +16,7 @@
// template <class InputIter>
// path u8path(InputIter, InputIter);
-#include <experimental/filesystem>
+#include "filesystem_include.hpp"
#include <type_traits>
#include <cassert>
@@ -25,7 +25,6 @@
#include "count_new.hpp"
#include "filesystem_test_helper.hpp"
-namespace fs = std::experimental::filesystem;
int main()
{
Modified: libcxx/trunk/test/std/experimental/filesystem/class.path/path.nonmember/path.io.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/experimental/filesystem/class.path/path.nonmember/path.io.pass.cpp?rev=328475&r1=328474&r2=328475&view=diff
==============================================================================
--- libcxx/trunk/test/std/experimental/filesystem/class.path/path.nonmember/path.io.pass.cpp (original)
+++ libcxx/trunk/test/std/experimental/filesystem/class.path/path.nonmember/path.io.pass.cpp Sun Mar 25 22:46:57 2018
@@ -22,7 +22,7 @@
// operator>>(basic_istream<charT, traits>& is, path& p)
//
-#include <experimental/filesystem>
+#include "filesystem_include.hpp"
#include <type_traits>
#include <sstream>
#include <cassert>
Modified: libcxx/trunk/test/std/experimental/filesystem/class.path/path.nonmember/path.io.unicode_bug.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/experimental/filesystem/class.path/path.nonmember/path.io.unicode_bug.pass.cpp?rev=328475&r1=328474&r2=328475&view=diff
==============================================================================
--- libcxx/trunk/test/std/experimental/filesystem/class.path/path.nonmember/path.io.unicode_bug.pass.cpp (original)
+++ libcxx/trunk/test/std/experimental/filesystem/class.path/path.nonmember/path.io.unicode_bug.pass.cpp Sun Mar 25 22:46:57 2018
@@ -27,7 +27,7 @@
// passes.
// XFAIL: *
-#include <experimental/filesystem>
+#include "filesystem_include.hpp"
#include <type_traits>
#include <sstream>
#include <cassert>
Modified: libcxx/trunk/test/std/experimental/filesystem/class.path/path.nonmember/swap.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/experimental/filesystem/class.path/path.nonmember/swap.pass.cpp?rev=328475&r1=328474&r2=328475&view=diff
==============================================================================
--- libcxx/trunk/test/std/experimental/filesystem/class.path/path.nonmember/swap.pass.cpp (original)
+++ libcxx/trunk/test/std/experimental/filesystem/class.path/path.nonmember/swap.pass.cpp Sun Mar 25 22:46:57 2018
@@ -13,7 +13,7 @@
// void swap(path& lhs, path& rhs) noexcept;
-#include <experimental/filesystem>
+#include "filesystem_include.hpp"
#include <type_traits>
#include <cassert>
@@ -21,7 +21,6 @@
#include "count_new.hpp"
#include "filesystem_test_helper.hpp"
-namespace fs = std::experimental::filesystem;
// NOTE: this is tested in path.members/path.modifiers via the member swap.
int main()
Modified: libcxx/trunk/test/std/experimental/filesystem/class.path/synop.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/experimental/filesystem/class.path/synop.pass.cpp?rev=328475&r1=328474&r2=328475&view=diff
==============================================================================
--- libcxx/trunk/test/std/experimental/filesystem/class.path/synop.pass.cpp (original)
+++ libcxx/trunk/test/std/experimental/filesystem/class.path/synop.pass.cpp Sun Mar 25 22:46:57 2018
@@ -17,13 +17,12 @@
// typedef basic_string<value_type> string_type;
// static constexpr value_type preferred_separator = ...;
-#include <experimental/filesystem>
+#include "filesystem_include.hpp"
#include <type_traits>
#include <cassert>
#include "test_macros.h"
-namespace fs = std::experimental::filesystem;
int main() {
using namespace fs;
Modified: libcxx/trunk/test/std/experimental/filesystem/class.rec.dir.itr/rec.dir.itr.members/copy.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/experimental/filesystem/class.rec.dir.itr/rec.dir.itr.members/copy.pass.cpp?rev=328475&r1=328474&r2=328475&view=diff
==============================================================================
--- libcxx/trunk/test/std/experimental/filesystem/class.rec.dir.itr/rec.dir.itr.members/copy.pass.cpp (original)
+++ libcxx/trunk/test/std/experimental/filesystem/class.rec.dir.itr/rec.dir.itr.members/copy.pass.cpp Sun Mar 25 22:46:57 2018
@@ -15,7 +15,7 @@
// recursive_recursive_directory_iterator(recursive_recursive_directory_iterator const&);
-#include <experimental/filesystem>
+#include "filesystem_include.hpp"
#include <type_traits>
#include <set>
#include <cassert>
@@ -24,7 +24,7 @@
#include "rapid-cxx-test.hpp"
#include "filesystem_test_helper.hpp"
-using namespace std::experimental::filesystem;
+using namespace fs;
TEST_SUITE(recursive_directory_iterator_copy_construct_tests)
Modified: libcxx/trunk/test/std/experimental/filesystem/class.rec.dir.itr/rec.dir.itr.members/copy_assign.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/experimental/filesystem/class.rec.dir.itr/rec.dir.itr.members/copy_assign.pass.cpp?rev=328475&r1=328474&r2=328475&view=diff
==============================================================================
--- libcxx/trunk/test/std/experimental/filesystem/class.rec.dir.itr/rec.dir.itr.members/copy_assign.pass.cpp (original)
+++ libcxx/trunk/test/std/experimental/filesystem/class.rec.dir.itr/rec.dir.itr.members/copy_assign.pass.cpp Sun Mar 25 22:46:57 2018
@@ -15,7 +15,7 @@
// recursive_directory_iterator& operator=(recursive_directory_iterator const&);
-#include <experimental/filesystem>
+#include "filesystem_include.hpp"
#include <type_traits>
#include <set>
#include <cassert>
@@ -24,7 +24,7 @@
#include "rapid-cxx-test.hpp"
#include "filesystem_test_helper.hpp"
-using namespace std::experimental::filesystem;
+using namespace fs;
TEST_SUITE(recursive_directory_iterator_copy_assign_tests)
Modified: libcxx/trunk/test/std/experimental/filesystem/class.rec.dir.itr/rec.dir.itr.members/ctor.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/experimental/filesystem/class.rec.dir.itr/rec.dir.itr.members/ctor.pass.cpp?rev=328475&r1=328474&r2=328475&view=diff
==============================================================================
--- libcxx/trunk/test/std/experimental/filesystem/class.rec.dir.itr/rec.dir.itr.members/ctor.pass.cpp (original)
+++ libcxx/trunk/test/std/experimental/filesystem/class.rec.dir.itr/rec.dir.itr.members/ctor.pass.cpp Sun Mar 25 22:46:57 2018
@@ -20,7 +20,7 @@
// recursive_directory_iterator(const path& p, directory_options options, error_code& ec);
-#include <experimental/filesystem>
+#include "filesystem_include.hpp"
#include <type_traits>
#include <set>
#include <cassert>
@@ -29,7 +29,7 @@
#include "rapid-cxx-test.hpp"
#include "filesystem_test_helper.hpp"
-using namespace std::experimental::filesystem;
+using namespace fs;
using RDI = recursive_directory_iterator;
@@ -87,7 +87,7 @@ TEST_CASE(test_construction_from_bad_pat
TEST_CASE(access_denied_test_case)
{
- using namespace std::experimental::filesystem;
+ using namespace fs;
scoped_test_env env;
path const testDir = env.make_env_path("dir1");
path const testFile = testDir / "testFile";
@@ -124,7 +124,7 @@ TEST_CASE(access_denied_test_case)
TEST_CASE(access_denied_to_file_test_case)
{
- using namespace std::experimental::filesystem;
+ using namespace fs;
scoped_test_env env;
path const testFile = env.make_env_path("file1");
env.create_file(testFile, 42);
Modified: libcxx/trunk/test/std/experimental/filesystem/class.rec.dir.itr/rec.dir.itr.members/depth.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/experimental/filesystem/class.rec.dir.itr/rec.dir.itr.members/depth.pass.cpp?rev=328475&r1=328474&r2=328475&view=diff
==============================================================================
--- libcxx/trunk/test/std/experimental/filesystem/class.rec.dir.itr/rec.dir.itr.members/depth.pass.cpp (original)
+++ libcxx/trunk/test/std/experimental/filesystem/class.rec.dir.itr/rec.dir.itr.members/depth.pass.cpp Sun Mar 25 22:46:57 2018
@@ -15,7 +15,7 @@
// int depth() const
-#include <experimental/filesystem>
+#include "filesystem_include.hpp"
#include <type_traits>
#include <set>
#include <cassert>
@@ -24,7 +24,7 @@
#include "rapid-cxx-test.hpp"
#include "filesystem_test_helper.hpp"
-using namespace std::experimental::filesystem;
+using namespace fs;
TEST_SUITE(recursive_directory_iterator_depth_tests)
Modified: libcxx/trunk/test/std/experimental/filesystem/class.rec.dir.itr/rec.dir.itr.members/disable_recursion_pending.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/experimental/filesystem/class.rec.dir.itr/rec.dir.itr.members/disable_recursion_pending.pass.cpp?rev=328475&r1=328474&r2=328475&view=diff
==============================================================================
--- libcxx/trunk/test/std/experimental/filesystem/class.rec.dir.itr/rec.dir.itr.members/disable_recursion_pending.pass.cpp (original)
+++ libcxx/trunk/test/std/experimental/filesystem/class.rec.dir.itr/rec.dir.itr.members/disable_recursion_pending.pass.cpp Sun Mar 25 22:46:57 2018
@@ -15,7 +15,7 @@
// void disable_recursion_pending();
-#include <experimental/filesystem>
+#include "filesystem_include.hpp"
#include <type_traits>
#include <set>
#include <cassert>
@@ -24,7 +24,7 @@
#include "rapid-cxx-test.hpp"
#include "filesystem_test_helper.hpp"
-using namespace std::experimental::filesystem;
+using namespace fs;
TEST_SUITE(recursive_directory_iterator_disable_recursion_pending_tests)
Modified: libcxx/trunk/test/std/experimental/filesystem/class.rec.dir.itr/rec.dir.itr.members/increment.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/experimental/filesystem/class.rec.dir.itr/rec.dir.itr.members/increment.pass.cpp?rev=328475&r1=328474&r2=328475&view=diff
==============================================================================
--- libcxx/trunk/test/std/experimental/filesystem/class.rec.dir.itr/rec.dir.itr.members/increment.pass.cpp (original)
+++ libcxx/trunk/test/std/experimental/filesystem/class.rec.dir.itr/rec.dir.itr.members/increment.pass.cpp Sun Mar 25 22:46:57 2018
@@ -16,7 +16,7 @@
// recursive_directory_iterator& operator++();
// recursive_directory_iterator& increment(error_code& ec) noexcept;
-#include <experimental/filesystem>
+#include "filesystem_include.hpp"
#include <type_traits>
#include <set>
#include <cassert>
@@ -25,7 +25,7 @@
#include "rapid-cxx-test.hpp"
#include "filesystem_test_helper.hpp"
-using namespace std::experimental::filesystem;
+using namespace fs;
TEST_SUITE(recursive_directory_iterator_increment_tests)
@@ -140,7 +140,7 @@ TEST_CASE(test_follow_symlinks)
TEST_CASE(access_denied_on_recursion_test_case)
{
- using namespace std::experimental::filesystem;
+ using namespace fs;
scoped_test_env env;
const path testFiles[] = {
env.create_dir("dir1"),
@@ -239,7 +239,7 @@ TEST_CASE(access_denied_on_recursion_tes
// See llvm.org/PR35078
TEST_CASE(test_PR35078)
{
- using namespace std::experimental::filesystem;
+ using namespace fs;
scoped_test_env env;
const path testFiles[] = {
env.create_dir("dir1"),
@@ -309,7 +309,7 @@ TEST_CASE(test_PR35078)
// See llvm.org/PR35078
TEST_CASE(test_PR35078_with_symlink)
{
- using namespace std::experimental::filesystem;
+ using namespace fs;
scoped_test_env env;
const path testFiles[] = {
env.create_dir("dir1"),
@@ -393,7 +393,7 @@ TEST_CASE(test_PR35078_with_symlink)
// See llvm.org/PR35078
TEST_CASE(test_PR35078_with_symlink_file)
{
- using namespace std::experimental::filesystem;
+ using namespace fs;
scoped_test_env env;
const path testFiles[] = {
env.create_dir("dir1"),
Modified: libcxx/trunk/test/std/experimental/filesystem/class.rec.dir.itr/rec.dir.itr.members/move.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/experimental/filesystem/class.rec.dir.itr/rec.dir.itr.members/move.pass.cpp?rev=328475&r1=328474&r2=328475&view=diff
==============================================================================
--- libcxx/trunk/test/std/experimental/filesystem/class.rec.dir.itr/rec.dir.itr.members/move.pass.cpp (original)
+++ libcxx/trunk/test/std/experimental/filesystem/class.rec.dir.itr/rec.dir.itr.members/move.pass.cpp Sun Mar 25 22:46:57 2018
@@ -15,7 +15,7 @@
// recursive_directory_iterator(recursive_directory_iterator&&) noexcept;
-#include <experimental/filesystem>
+#include "filesystem_include.hpp"
#include <type_traits>
#include <set>
#include <cassert>
@@ -24,7 +24,7 @@
#include "rapid-cxx-test.hpp"
#include "filesystem_test_helper.hpp"
-using namespace std::experimental::filesystem;
+using namespace fs;
TEST_SUITE(recursive_directory_iterator_move_construct_tests)
Modified: libcxx/trunk/test/std/experimental/filesystem/class.rec.dir.itr/rec.dir.itr.members/move_assign.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/experimental/filesystem/class.rec.dir.itr/rec.dir.itr.members/move_assign.pass.cpp?rev=328475&r1=328474&r2=328475&view=diff
==============================================================================
--- libcxx/trunk/test/std/experimental/filesystem/class.rec.dir.itr/rec.dir.itr.members/move_assign.pass.cpp (original)
+++ libcxx/trunk/test/std/experimental/filesystem/class.rec.dir.itr/rec.dir.itr.members/move_assign.pass.cpp Sun Mar 25 22:46:57 2018
@@ -15,7 +15,7 @@
// recursive_directory_iterator& operator=(recursive_directory_iterator const&);
-#include <experimental/filesystem>
+#include "filesystem_include.hpp"
#include <type_traits>
#include <set>
#include <cassert>
@@ -30,7 +30,7 @@
#pragma clang diagnostic ignored "-Wself-move"
#endif
-using namespace std::experimental::filesystem;
+using namespace fs;
TEST_SUITE(recursive_directory_iterator_move_assign_tests)
Modified: libcxx/trunk/test/std/experimental/filesystem/class.rec.dir.itr/rec.dir.itr.members/pop.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/experimental/filesystem/class.rec.dir.itr/rec.dir.itr.members/pop.pass.cpp?rev=328475&r1=328474&r2=328475&view=diff
==============================================================================
--- libcxx/trunk/test/std/experimental/filesystem/class.rec.dir.itr/rec.dir.itr.members/pop.pass.cpp (original)
+++ libcxx/trunk/test/std/experimental/filesystem/class.rec.dir.itr/rec.dir.itr.members/pop.pass.cpp Sun Mar 25 22:46:57 2018
@@ -16,7 +16,7 @@
// void pop();
// void pop(error_code& ec);
-#include <experimental/filesystem>
+#include "filesystem_include.hpp"
#include <set>
#include <cassert>
@@ -24,7 +24,7 @@
#include "rapid-cxx-test.hpp"
#include "filesystem_test_helper.hpp"
-using namespace std::experimental::filesystem;
+using namespace fs;
TEST_SUITE(recursive_directory_iterator_pop_tests)
Modified: libcxx/trunk/test/std/experimental/filesystem/class.rec.dir.itr/rec.dir.itr.members/recursion_pending.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/experimental/filesystem/class.rec.dir.itr/rec.dir.itr.members/recursion_pending.pass.cpp?rev=328475&r1=328474&r2=328475&view=diff
==============================================================================
--- libcxx/trunk/test/std/experimental/filesystem/class.rec.dir.itr/rec.dir.itr.members/recursion_pending.pass.cpp (original)
+++ libcxx/trunk/test/std/experimental/filesystem/class.rec.dir.itr/rec.dir.itr.members/recursion_pending.pass.cpp Sun Mar 25 22:46:57 2018
@@ -15,7 +15,7 @@
// bool recursion_pending() const;
-#include <experimental/filesystem>
+#include "filesystem_include.hpp"
#include <type_traits>
#include <set>
#include <cassert>
@@ -24,7 +24,7 @@
#include "rapid-cxx-test.hpp"
#include "filesystem_test_helper.hpp"
-using namespace std::experimental::filesystem;
+using namespace fs;
TEST_SUITE(recursive_directory_iterator_recursion_pending_tests)
Modified: libcxx/trunk/test/std/experimental/filesystem/class.rec.dir.itr/rec.dir.itr.nonmembers/begin_end.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/experimental/filesystem/class.rec.dir.itr/rec.dir.itr.nonmembers/begin_end.pass.cpp?rev=328475&r1=328474&r2=328475&view=diff
==============================================================================
--- libcxx/trunk/test/std/experimental/filesystem/class.rec.dir.itr/rec.dir.itr.nonmembers/begin_end.pass.cpp (original)
+++ libcxx/trunk/test/std/experimental/filesystem/class.rec.dir.itr/rec.dir.itr.nonmembers/begin_end.pass.cpp Sun Mar 25 22:46:57 2018
@@ -16,7 +16,7 @@
// recursive_directory_iterator begin(recursive_directory_iterator iter) noexcept;
// recursive_directory_iterator end(recursive_directory_iterator iter) noexcept;
-#include <experimental/filesystem>
+#include "filesystem_include.hpp"
#include <type_traits>
#include <set>
#include <cassert>
@@ -26,7 +26,7 @@
#include "filesystem_test_helper.hpp"
#include <iostream>
-using namespace std::experimental::filesystem;
+using namespace fs;
TEST_SUITE(recursive_directory_iterator_begin_end_tests)
Modified: libcxx/trunk/test/std/experimental/filesystem/fs.enum/enum.copy_options.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/experimental/filesystem/fs.enum/enum.copy_options.pass.cpp?rev=328475&r1=328474&r2=328475&view=diff
==============================================================================
--- libcxx/trunk/test/std/experimental/filesystem/fs.enum/enum.copy_options.pass.cpp (original)
+++ libcxx/trunk/test/std/experimental/filesystem/fs.enum/enum.copy_options.pass.cpp Sun Mar 25 22:46:57 2018
@@ -13,14 +13,13 @@
// enum class copy_options;
-#include <experimental/filesystem>
+#include "filesystem_include.hpp"
#include <type_traits>
#include <cassert>
#include "check_bitmask_types.hpp"
#include "test_macros.h"
-namespace fs = std::experimental::filesystem;
constexpr fs::copy_options ME(int val) { return static_cast<fs::copy_options>(val); }
Modified: libcxx/trunk/test/std/experimental/filesystem/fs.enum/enum.directory_options.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/experimental/filesystem/fs.enum/enum.directory_options.pass.cpp?rev=328475&r1=328474&r2=328475&view=diff
==============================================================================
--- libcxx/trunk/test/std/experimental/filesystem/fs.enum/enum.directory_options.pass.cpp (original)
+++ libcxx/trunk/test/std/experimental/filesystem/fs.enum/enum.directory_options.pass.cpp Sun Mar 25 22:46:57 2018
@@ -13,7 +13,7 @@
// enum class directory_options;
-#include <experimental/filesystem>
+#include "filesystem_include.hpp"
#include <type_traits>
#include <cassert>
#include <sys/stat.h>
@@ -21,7 +21,6 @@
#include "test_macros.h"
#include "check_bitmask_types.hpp"
-namespace fs = std::experimental::filesystem;
constexpr fs::directory_options ME(int val) { return static_cast<fs::directory_options>(val); }
Modified: libcxx/trunk/test/std/experimental/filesystem/fs.enum/enum.file_type.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/experimental/filesystem/fs.enum/enum.file_type.pass.cpp?rev=328475&r1=328474&r2=328475&view=diff
==============================================================================
--- libcxx/trunk/test/std/experimental/filesystem/fs.enum/enum.file_type.pass.cpp (original)
+++ libcxx/trunk/test/std/experimental/filesystem/fs.enum/enum.file_type.pass.cpp Sun Mar 25 22:46:57 2018
@@ -13,13 +13,12 @@
// enum class file_type;
-#include <experimental/filesystem>
+#include "filesystem_include.hpp"
#include <type_traits>
#include <cassert>
#include "test_macros.h"
-namespace fs = std::experimental::filesystem;
constexpr fs::file_type ME(int val) { return static_cast<fs::file_type>(val); }
Modified: libcxx/trunk/test/std/experimental/filesystem/fs.enum/enum.perms.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/experimental/filesystem/fs.enum/enum.perms.pass.cpp?rev=328475&r1=328474&r2=328475&view=diff
==============================================================================
--- libcxx/trunk/test/std/experimental/filesystem/fs.enum/enum.perms.pass.cpp (original)
+++ libcxx/trunk/test/std/experimental/filesystem/fs.enum/enum.perms.pass.cpp Sun Mar 25 22:46:57 2018
@@ -13,7 +13,7 @@
// enum class perms;
-#include <experimental/filesystem>
+#include "filesystem_include.hpp"
#include <type_traits>
#include <cassert>
#include <sys/stat.h>
@@ -21,7 +21,6 @@
#include "test_macros.h"
#include "check_bitmask_types.hpp"
-namespace fs = std::experimental::filesystem;
constexpr fs::perms ME(int val) { return static_cast<fs::perms>(val); }
Modified: libcxx/trunk/test/std/experimental/filesystem/fs.filesystem.synopsis/file_time_type.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/experimental/filesystem/fs.filesystem.synopsis/file_time_type.pass.cpp?rev=328475&r1=328474&r2=328475&view=diff
==============================================================================
--- libcxx/trunk/test/std/experimental/filesystem/fs.filesystem.synopsis/file_time_type.pass.cpp (original)
+++ libcxx/trunk/test/std/experimental/filesystem/fs.filesystem.synopsis/file_time_type.pass.cpp Sun Mar 25 22:46:57 2018
@@ -13,7 +13,7 @@
// typedef TrivialClock file_time_type;
-#include <experimental/filesystem>
+#include "filesystem_include.hpp"
#include <chrono>
#include <type_traits>
@@ -25,7 +25,7 @@ typedef std::chrono::time_point<Expected
int main() {
static_assert(std::is_same<
- std::experimental::filesystem::file_time_type,
+ fs::file_time_type,
ExpectedTimePoint
>::value, "");
}
Modified: libcxx/trunk/test/std/experimental/filesystem/fs.op.funcs/fs.op.absolute/absolute.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/experimental/filesystem/fs.op.funcs/fs.op.absolute/absolute.pass.cpp?rev=328475&r1=328474&r2=328475&view=diff
==============================================================================
--- libcxx/trunk/test/std/experimental/filesystem/fs.op.funcs/fs.op.absolute/absolute.pass.cpp (original)
+++ libcxx/trunk/test/std/experimental/filesystem/fs.op.funcs/fs.op.absolute/absolute.pass.cpp Sun Mar 25 22:46:57 2018
@@ -13,7 +13,7 @@
// path absolute(const path& p, const path& base=current_path());
-#include <experimental/filesystem>
+#include "filesystem_include.hpp"
#include <type_traits>
#include <cassert>
@@ -21,7 +21,7 @@
#include "rapid-cxx-test.hpp"
#include "filesystem_test_helper.hpp"
-using namespace std::experimental::filesystem;
+using namespace fs;
TEST_SUITE(filesystem_absolute_path_test_suite)
Modified: libcxx/trunk/test/std/experimental/filesystem/fs.op.funcs/fs.op.canonical/canonical.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/experimental/filesystem/fs.op.funcs/fs.op.canonical/canonical.pass.cpp?rev=328475&r1=328474&r2=328475&view=diff
==============================================================================
--- libcxx/trunk/test/std/experimental/filesystem/fs.op.funcs/fs.op.canonical/canonical.pass.cpp (original)
+++ libcxx/trunk/test/std/experimental/filesystem/fs.op.funcs/fs.op.canonical/canonical.pass.cpp Sun Mar 25 22:46:57 2018
@@ -15,7 +15,7 @@
// path canonical(const path& p, error_code& ec);
// path canonical(const path& p, const path& base, error_code& ec);
-#include <experimental/filesystem>
+#include "filesystem_include.hpp"
#include <type_traits>
#include <cassert>
@@ -23,7 +23,7 @@
#include "rapid-cxx-test.hpp"
#include "filesystem_test_helper.hpp"
-using namespace std::experimental::filesystem;
+using namespace fs;
TEST_SUITE(filesystem_canonical_path_test_suite)
Modified: libcxx/trunk/test/std/experimental/filesystem/fs.op.funcs/fs.op.copy/copy.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/experimental/filesystem/fs.op.funcs/fs.op.copy/copy.pass.cpp?rev=328475&r1=328474&r2=328475&view=diff
==============================================================================
--- libcxx/trunk/test/std/experimental/filesystem/fs.op.funcs/fs.op.copy/copy.pass.cpp (original)
+++ libcxx/trunk/test/std/experimental/filesystem/fs.op.funcs/fs.op.copy/copy.pass.cpp Sun Mar 25 22:46:57 2018
@@ -17,7 +17,7 @@
// void copy(const path& from, const path& to, copy_options options,
// error_code& ec);
-#include <experimental/filesystem>
+#include "filesystem_include.hpp"
#include <type_traits>
#include <cstddef>
#include <cassert>
@@ -26,8 +26,7 @@
#include "rapid-cxx-test.hpp"
#include "filesystem_test_helper.hpp"
-using namespace std::experimental::filesystem;
-namespace fs = std::experimental::filesystem;
+using namespace fs;
using CO = fs::copy_options;
Modified: libcxx/trunk/test/std/experimental/filesystem/fs.op.funcs/fs.op.copy_file/copy_file.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/experimental/filesystem/fs.op.funcs/fs.op.copy_file/copy_file.pass.cpp?rev=328475&r1=328474&r2=328475&view=diff
==============================================================================
--- libcxx/trunk/test/std/experimental/filesystem/fs.op.funcs/fs.op.copy_file/copy_file.pass.cpp (original)
+++ libcxx/trunk/test/std/experimental/filesystem/fs.op.funcs/fs.op.copy_file/copy_file.pass.cpp Sun Mar 25 22:46:57 2018
@@ -17,7 +17,7 @@
// bool copy_file(const path& from, const path& to, copy_options options,
// error_code& ec) noexcept;
-#include <experimental/filesystem>
+#include "filesystem_include.hpp"
#include <type_traits>
#include <chrono>
#include <cassert>
@@ -26,8 +26,7 @@
#include "rapid-cxx-test.hpp"
#include "filesystem_test_helper.hpp"
-using namespace std::experimental::filesystem;
-namespace fs = std::experimental::filesystem;
+using namespace fs;
using CO = fs::copy_options;
Modified: libcxx/trunk/test/std/experimental/filesystem/fs.op.funcs/fs.op.copy_symlink/copy_symlink.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/experimental/filesystem/fs.op.funcs/fs.op.copy_symlink/copy_symlink.pass.cpp?rev=328475&r1=328474&r2=328475&view=diff
==============================================================================
--- libcxx/trunk/test/std/experimental/filesystem/fs.op.funcs/fs.op.copy_symlink/copy_symlink.pass.cpp (original)
+++ libcxx/trunk/test/std/experimental/filesystem/fs.op.funcs/fs.op.copy_symlink/copy_symlink.pass.cpp Sun Mar 25 22:46:57 2018
@@ -15,7 +15,7 @@
// void copy_symlink(const path& existing_symlink, const path& new_symlink,
// error_code& ec) noexcept;
-#include <experimental/filesystem>
+#include "filesystem_include.hpp"
#include <type_traits>
#include <cassert>
@@ -23,8 +23,7 @@
#include "rapid-cxx-test.hpp"
#include "filesystem_test_helper.hpp"
-using namespace std::experimental::filesystem;
-namespace fs = std::experimental::filesystem;
+using namespace fs;
TEST_SUITE(filesystem_copy_symlink_test_suite)
Modified: libcxx/trunk/test/std/experimental/filesystem/fs.op.funcs/fs.op.create_directories/create_directories.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/experimental/filesystem/fs.op.funcs/fs.op.create_directories/create_directories.pass.cpp?rev=328475&r1=328474&r2=328475&view=diff
==============================================================================
--- libcxx/trunk/test/std/experimental/filesystem/fs.op.funcs/fs.op.create_directories/create_directories.pass.cpp (original)
+++ libcxx/trunk/test/std/experimental/filesystem/fs.op.funcs/fs.op.create_directories/create_directories.pass.cpp Sun Mar 25 22:46:57 2018
@@ -14,7 +14,7 @@
// bool create_directories(const path& p);
// bool create_directories(const path& p, error_code& ec) noexcept;
-#include <experimental/filesystem>
+#include "filesystem_include.hpp"
#include <type_traits>
#include <cassert>
@@ -22,8 +22,7 @@
#include "rapid-cxx-test.hpp"
#include "filesystem_test_helper.hpp"
-using namespace std::experimental::filesystem;
-namespace fs = std::experimental::filesystem;
+using namespace fs;
TEST_SUITE(filesystem_create_directories_test_suite)
Modified: libcxx/trunk/test/std/experimental/filesystem/fs.op.funcs/fs.op.create_directory/create_directory.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/experimental/filesystem/fs.op.funcs/fs.op.create_directory/create_directory.pass.cpp?rev=328475&r1=328474&r2=328475&view=diff
==============================================================================
--- libcxx/trunk/test/std/experimental/filesystem/fs.op.funcs/fs.op.create_directory/create_directory.pass.cpp (original)
+++ libcxx/trunk/test/std/experimental/filesystem/fs.op.funcs/fs.op.create_directory/create_directory.pass.cpp Sun Mar 25 22:46:57 2018
@@ -16,7 +16,7 @@
// bool create_directory(const path& p, const path& attr);
// bool create_directory(const path& p, const path& attr, error_code& ec) noexcept;
-#include <experimental/filesystem>
+#include "filesystem_include.hpp"
#include <type_traits>
#include <cassert>
@@ -27,8 +27,7 @@
#include <sys/types.h>
#include <sys/stat.h>
-using namespace std::experimental::filesystem;
-namespace fs = std::experimental::filesystem;
+using namespace fs;
fs::perms read_umask() {
mode_t old_mask = umask(0);
Modified: libcxx/trunk/test/std/experimental/filesystem/fs.op.funcs/fs.op.create_directory/create_directory_with_attributes.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/experimental/filesystem/fs.op.funcs/fs.op.create_directory/create_directory_with_attributes.pass.cpp?rev=328475&r1=328474&r2=328475&view=diff
==============================================================================
--- libcxx/trunk/test/std/experimental/filesystem/fs.op.funcs/fs.op.create_directory/create_directory_with_attributes.pass.cpp (original)
+++ libcxx/trunk/test/std/experimental/filesystem/fs.op.funcs/fs.op.create_directory/create_directory_with_attributes.pass.cpp Sun Mar 25 22:46:57 2018
@@ -14,7 +14,7 @@
// bool create_directory(const path& p, const path& attr);
// bool create_directory(const path& p, const path& attr, error_code& ec) noexcept;
-#include <experimental/filesystem>
+#include "filesystem_include.hpp"
#include <type_traits>
#include <cassert>
@@ -22,8 +22,7 @@
#include "rapid-cxx-test.hpp"
#include "filesystem_test_helper.hpp"
-using namespace std::experimental::filesystem;
-namespace fs = std::experimental::filesystem;
+using namespace fs;
TEST_SUITE(filesystem_create_directory_test_suite)
Modified: libcxx/trunk/test/std/experimental/filesystem/fs.op.funcs/fs.op.create_directory_symlink/create_directory_symlink.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/experimental/filesystem/fs.op.funcs/fs.op.create_directory_symlink/create_directory_symlink.pass.cpp?rev=328475&r1=328474&r2=328475&view=diff
==============================================================================
--- libcxx/trunk/test/std/experimental/filesystem/fs.op.funcs/fs.op.create_directory_symlink/create_directory_symlink.pass.cpp (original)
+++ libcxx/trunk/test/std/experimental/filesystem/fs.op.funcs/fs.op.create_directory_symlink/create_directory_symlink.pass.cpp Sun Mar 25 22:46:57 2018
@@ -15,15 +15,14 @@
// void create_directory_symlink(const path& existing_symlink, const path& new_symlink,
// error_code& ec) noexcept;
-#include <experimental/filesystem>
+#include "filesystem_include.hpp"
#include <cassert>
#include "test_macros.h"
#include "rapid-cxx-test.hpp"
#include "filesystem_test_helper.hpp"
-using namespace std::experimental::filesystem;
-namespace fs = std::experimental::filesystem;
+using namespace fs;
TEST_SUITE(filesystem_create_directory_symlink_test_suite)
Modified: libcxx/trunk/test/std/experimental/filesystem/fs.op.funcs/fs.op.create_hard_link/create_hard_link.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/experimental/filesystem/fs.op.funcs/fs.op.create_hard_link/create_hard_link.pass.cpp?rev=328475&r1=328474&r2=328475&view=diff
==============================================================================
--- libcxx/trunk/test/std/experimental/filesystem/fs.op.funcs/fs.op.create_hard_link/create_hard_link.pass.cpp (original)
+++ libcxx/trunk/test/std/experimental/filesystem/fs.op.funcs/fs.op.create_hard_link/create_hard_link.pass.cpp Sun Mar 25 22:46:57 2018
@@ -15,14 +15,13 @@
// void create_hard_link(const path& existing_symlink, const path& new_symlink,
// error_code& ec) noexcept;
-#include <experimental/filesystem>
+#include "filesystem_include.hpp"
#include "test_macros.h"
#include "rapid-cxx-test.hpp"
#include "filesystem_test_helper.hpp"
-using namespace std::experimental::filesystem;
-namespace fs = std::experimental::filesystem;
+using namespace fs;
TEST_SUITE(filesystem_create_hard_link_test_suite)
Modified: libcxx/trunk/test/std/experimental/filesystem/fs.op.funcs/fs.op.create_symlink/create_symlink.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/experimental/filesystem/fs.op.funcs/fs.op.create_symlink/create_symlink.pass.cpp?rev=328475&r1=328474&r2=328475&view=diff
==============================================================================
--- libcxx/trunk/test/std/experimental/filesystem/fs.op.funcs/fs.op.create_symlink/create_symlink.pass.cpp (original)
+++ libcxx/trunk/test/std/experimental/filesystem/fs.op.funcs/fs.op.create_symlink/create_symlink.pass.cpp Sun Mar 25 22:46:57 2018
@@ -15,15 +15,14 @@
// void create_symlink(const path& existing_symlink, const path& new_symlink,
// error_code& ec) noexcept;
-#include <experimental/filesystem>
+#include "filesystem_include.hpp"
#include <cassert>
#include "test_macros.h"
#include "rapid-cxx-test.hpp"
#include "filesystem_test_helper.hpp"
-using namespace std::experimental::filesystem;
-namespace fs = std::experimental::filesystem;
+using namespace fs;
TEST_SUITE(filesystem_create_symlink_test_suite)
Modified: libcxx/trunk/test/std/experimental/filesystem/fs.op.funcs/fs.op.current_path/current_path.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/experimental/filesystem/fs.op.funcs/fs.op.current_path/current_path.pass.cpp?rev=328475&r1=328474&r2=328475&view=diff
==============================================================================
--- libcxx/trunk/test/std/experimental/filesystem/fs.op.funcs/fs.op.current_path/current_path.pass.cpp (original)
+++ libcxx/trunk/test/std/experimental/filesystem/fs.op.funcs/fs.op.current_path/current_path.pass.cpp Sun Mar 25 22:46:57 2018
@@ -16,7 +16,7 @@
// void current_path(path const&);
// void current_path(path const&, std::error_code& ec) noexcept;
-#include <experimental/filesystem>
+#include "filesystem_include.hpp"
#include <type_traits>
#include <cassert>
@@ -24,7 +24,7 @@
#include "rapid-cxx-test.hpp"
#include "filesystem_test_helper.hpp"
-using namespace std::experimental::filesystem;
+using namespace fs;
TEST_SUITE(filesystem_current_path_path_test_suite)
Modified: libcxx/trunk/test/std/experimental/filesystem/fs.op.funcs/fs.op.equivalent/equivalent.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/experimental/filesystem/fs.op.funcs/fs.op.equivalent/equivalent.pass.cpp?rev=328475&r1=328474&r2=328475&view=diff
==============================================================================
--- libcxx/trunk/test/std/experimental/filesystem/fs.op.funcs/fs.op.equivalent/equivalent.pass.cpp (original)
+++ libcxx/trunk/test/std/experimental/filesystem/fs.op.funcs/fs.op.equivalent/equivalent.pass.cpp Sun Mar 25 22:46:57 2018
@@ -14,7 +14,7 @@
// bool equivalent(path const& lhs, path const& rhs);
// bool equivalent(path const& lhs, path const& rhs, std::error_code& ec) noexcept;
-#include <experimental/filesystem>
+#include "filesystem_include.hpp"
#include <type_traits>
#include <cassert>
@@ -22,7 +22,7 @@
#include "rapid-cxx-test.hpp"
#include "filesystem_test_helper.hpp"
-using namespace std::experimental::filesystem;
+using namespace fs;
TEST_SUITE(equivalent_test_suite)
Modified: libcxx/trunk/test/std/experimental/filesystem/fs.op.funcs/fs.op.exists/exists.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/experimental/filesystem/fs.op.funcs/fs.op.exists/exists.pass.cpp?rev=328475&r1=328474&r2=328475&view=diff
==============================================================================
--- libcxx/trunk/test/std/experimental/filesystem/fs.op.funcs/fs.op.exists/exists.pass.cpp (original)
+++ libcxx/trunk/test/std/experimental/filesystem/fs.op.funcs/fs.op.exists/exists.pass.cpp Sun Mar 25 22:46:57 2018
@@ -15,7 +15,7 @@
// bool exists(path const& p);
// bool exists(path const& p, std::error_code& ec) noexcept;
-#include <experimental/filesystem>
+#include "filesystem_include.hpp"
#include <type_traits>
#include <cassert>
@@ -23,7 +23,7 @@
#include "rapid-cxx-test.hpp"
#include "filesystem_test_helper.hpp"
-using namespace std::experimental::filesystem;
+using namespace fs;
TEST_SUITE(exists_test_suite)
Modified: libcxx/trunk/test/std/experimental/filesystem/fs.op.funcs/fs.op.file_size/file_size.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/experimental/filesystem/fs.op.funcs/fs.op.file_size/file_size.pass.cpp?rev=328475&r1=328474&r2=328475&view=diff
==============================================================================
--- libcxx/trunk/test/std/experimental/filesystem/fs.op.funcs/fs.op.file_size/file_size.pass.cpp (original)
+++ libcxx/trunk/test/std/experimental/filesystem/fs.op.funcs/fs.op.file_size/file_size.pass.cpp Sun Mar 25 22:46:57 2018
@@ -14,7 +14,7 @@
// uintmax_t file_size(const path& p);
// uintmax_t file_size(const path& p, std::error_code& ec) noexcept;
-#include <experimental/filesystem>
+#include "filesystem_include.hpp"
#include <type_traits>
#include <cassert>
@@ -22,7 +22,7 @@
#include "rapid-cxx-test.hpp"
#include "filesystem_test_helper.hpp"
-using namespace std::experimental::filesystem;
+using namespace fs;
TEST_SUITE(file_size_test_suite)
Modified: libcxx/trunk/test/std/experimental/filesystem/fs.op.funcs/fs.op.hard_lk_ct/hard_link_count.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/experimental/filesystem/fs.op.funcs/fs.op.hard_lk_ct/hard_link_count.pass.cpp?rev=328475&r1=328474&r2=328475&view=diff
==============================================================================
--- libcxx/trunk/test/std/experimental/filesystem/fs.op.funcs/fs.op.hard_lk_ct/hard_link_count.pass.cpp (original)
+++ libcxx/trunk/test/std/experimental/filesystem/fs.op.funcs/fs.op.hard_lk_ct/hard_link_count.pass.cpp Sun Mar 25 22:46:57 2018
@@ -14,7 +14,7 @@
// uintmax_t hard_link_count(const path& p);
// uintmax_t hard_link_count(const path& p, std::error_code& ec) noexcept;
-#include <experimental/filesystem>
+#include "filesystem_include.hpp"
#include <type_traits>
#include <cassert>
@@ -22,7 +22,7 @@
#include "rapid-cxx-test.hpp"
#include "filesystem_test_helper.hpp"
-using namespace std::experimental::filesystem;
+using namespace fs;
TEST_SUITE(hard_link_count_test_suite)
Modified: libcxx/trunk/test/std/experimental/filesystem/fs.op.funcs/fs.op.is_block_file/is_block_file.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/experimental/filesystem/fs.op.funcs/fs.op.is_block_file/is_block_file.pass.cpp?rev=328475&r1=328474&r2=328475&view=diff
==============================================================================
--- libcxx/trunk/test/std/experimental/filesystem/fs.op.funcs/fs.op.is_block_file/is_block_file.pass.cpp (original)
+++ libcxx/trunk/test/std/experimental/filesystem/fs.op.funcs/fs.op.is_block_file/is_block_file.pass.cpp Sun Mar 25 22:46:57 2018
@@ -15,7 +15,7 @@
// bool is_block_file(path const& p);
// bool is_block_file(path const& p, std::error_code& ec) noexcept;
-#include <experimental/filesystem>
+#include "filesystem_include.hpp"
#include <type_traits>
#include <cassert>
@@ -23,7 +23,7 @@
#include "rapid-cxx-test.hpp"
#include "filesystem_test_helper.hpp"
-using namespace std::experimental::filesystem;
+using namespace fs;
TEST_SUITE(is_block_file_test_suite)
Modified: libcxx/trunk/test/std/experimental/filesystem/fs.op.funcs/fs.op.is_char_file/is_character_file.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/experimental/filesystem/fs.op.funcs/fs.op.is_char_file/is_character_file.pass.cpp?rev=328475&r1=328474&r2=328475&view=diff
==============================================================================
--- libcxx/trunk/test/std/experimental/filesystem/fs.op.funcs/fs.op.is_char_file/is_character_file.pass.cpp (original)
+++ libcxx/trunk/test/std/experimental/filesystem/fs.op.funcs/fs.op.is_char_file/is_character_file.pass.cpp Sun Mar 25 22:46:57 2018
@@ -15,7 +15,7 @@
// bool is_character_file(path const& p);
// bool is_character_file(path const& p, std::error_code& ec) noexcept;
-#include <experimental/filesystem>
+#include "filesystem_include.hpp"
#include <type_traits>
#include <cassert>
@@ -23,7 +23,7 @@
#include "rapid-cxx-test.hpp"
#include "filesystem_test_helper.hpp"
-using namespace std::experimental::filesystem;
+using namespace fs;
TEST_SUITE(is_character_file_test_suite)
Modified: libcxx/trunk/test/std/experimental/filesystem/fs.op.funcs/fs.op.is_directory/is_directory.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/experimental/filesystem/fs.op.funcs/fs.op.is_directory/is_directory.pass.cpp?rev=328475&r1=328474&r2=328475&view=diff
==============================================================================
--- libcxx/trunk/test/std/experimental/filesystem/fs.op.funcs/fs.op.is_directory/is_directory.pass.cpp (original)
+++ libcxx/trunk/test/std/experimental/filesystem/fs.op.funcs/fs.op.is_directory/is_directory.pass.cpp Sun Mar 25 22:46:57 2018
@@ -15,7 +15,7 @@
// bool is_directory(path const& p);
// bool is_directory(path const& p, std::error_code& ec) noexcept;
-#include <experimental/filesystem>
+#include "filesystem_include.hpp"
#include <type_traits>
#include <cassert>
@@ -23,7 +23,7 @@
#include "rapid-cxx-test.hpp"
#include "filesystem_test_helper.hpp"
-using namespace std::experimental::filesystem;
+using namespace fs;
TEST_SUITE(is_directory_test_suite)
Modified: libcxx/trunk/test/std/experimental/filesystem/fs.op.funcs/fs.op.is_empty/is_empty.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/experimental/filesystem/fs.op.funcs/fs.op.is_empty/is_empty.pass.cpp?rev=328475&r1=328474&r2=328475&view=diff
==============================================================================
--- libcxx/trunk/test/std/experimental/filesystem/fs.op.funcs/fs.op.is_empty/is_empty.pass.cpp (original)
+++ libcxx/trunk/test/std/experimental/filesystem/fs.op.funcs/fs.op.is_empty/is_empty.pass.cpp Sun Mar 25 22:46:57 2018
@@ -14,7 +14,7 @@
// bool is_empty(path const& p);
// bool is_empty(path const& p, std::error_code& ec);
-#include <experimental/filesystem>
+#include "filesystem_include.hpp"
#include <type_traits>
#include <cassert>
@@ -22,7 +22,7 @@
#include "rapid-cxx-test.hpp"
#include "filesystem_test_helper.hpp"
-using namespace std::experimental::filesystem;
+using namespace fs;
TEST_SUITE(is_empty_test_suite)
Modified: libcxx/trunk/test/std/experimental/filesystem/fs.op.funcs/fs.op.is_fifo/is_fifo.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/experimental/filesystem/fs.op.funcs/fs.op.is_fifo/is_fifo.pass.cpp?rev=328475&r1=328474&r2=328475&view=diff
==============================================================================
--- libcxx/trunk/test/std/experimental/filesystem/fs.op.funcs/fs.op.is_fifo/is_fifo.pass.cpp (original)
+++ libcxx/trunk/test/std/experimental/filesystem/fs.op.funcs/fs.op.is_fifo/is_fifo.pass.cpp Sun Mar 25 22:46:57 2018
@@ -15,7 +15,7 @@
// bool is_fifo(path const& p);
// bool is_fifo(path const& p, std::error_code& ec) noexcept;
-#include <experimental/filesystem>
+#include "filesystem_include.hpp"
#include <type_traits>
#include <cassert>
@@ -23,7 +23,7 @@
#include "rapid-cxx-test.hpp"
#include "filesystem_test_helper.hpp"
-using namespace std::experimental::filesystem;
+using namespace fs;
TEST_SUITE(is_fifo_test_suite)
Modified: libcxx/trunk/test/std/experimental/filesystem/fs.op.funcs/fs.op.is_other/is_other.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/experimental/filesystem/fs.op.funcs/fs.op.is_other/is_other.pass.cpp?rev=328475&r1=328474&r2=328475&view=diff
==============================================================================
--- libcxx/trunk/test/std/experimental/filesystem/fs.op.funcs/fs.op.is_other/is_other.pass.cpp (original)
+++ libcxx/trunk/test/std/experimental/filesystem/fs.op.funcs/fs.op.is_other/is_other.pass.cpp Sun Mar 25 22:46:57 2018
@@ -15,7 +15,7 @@
// bool is_other(path const& p);
// bool is_other(path const& p, std::error_code& ec) noexcept;
-#include <experimental/filesystem>
+#include "filesystem_include.hpp"
#include <type_traits>
#include <cassert>
@@ -23,7 +23,7 @@
#include "rapid-cxx-test.hpp"
#include "filesystem_test_helper.hpp"
-using namespace std::experimental::filesystem;
+using namespace fs;
TEST_SUITE(is_other_test_suite)
Modified: libcxx/trunk/test/std/experimental/filesystem/fs.op.funcs/fs.op.is_regular_file/is_regular_file.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/experimental/filesystem/fs.op.funcs/fs.op.is_regular_file/is_regular_file.pass.cpp?rev=328475&r1=328474&r2=328475&view=diff
==============================================================================
--- libcxx/trunk/test/std/experimental/filesystem/fs.op.funcs/fs.op.is_regular_file/is_regular_file.pass.cpp (original)
+++ libcxx/trunk/test/std/experimental/filesystem/fs.op.funcs/fs.op.is_regular_file/is_regular_file.pass.cpp Sun Mar 25 22:46:57 2018
@@ -15,7 +15,7 @@
// bool is_regular_file(path const& p);
// bool is_regular_file(path const& p, std::error_code& ec) noexcept;
-#include <experimental/filesystem>
+#include "filesystem_include.hpp"
#include <type_traits>
#include <cassert>
@@ -23,7 +23,7 @@
#include "rapid-cxx-test.hpp"
#include "filesystem_test_helper.hpp"
-using namespace std::experimental::filesystem;
+using namespace fs;
TEST_SUITE(is_regular_file_test_suite)
Modified: libcxx/trunk/test/std/experimental/filesystem/fs.op.funcs/fs.op.is_socket/is_socket.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/experimental/filesystem/fs.op.funcs/fs.op.is_socket/is_socket.pass.cpp?rev=328475&r1=328474&r2=328475&view=diff
==============================================================================
--- libcxx/trunk/test/std/experimental/filesystem/fs.op.funcs/fs.op.is_socket/is_socket.pass.cpp (original)
+++ libcxx/trunk/test/std/experimental/filesystem/fs.op.funcs/fs.op.is_socket/is_socket.pass.cpp Sun Mar 25 22:46:57 2018
@@ -15,7 +15,7 @@
// bool is_socket(path const& p);
// bool is_socket(path const& p, std::error_code& ec) noexcept;
-#include <experimental/filesystem>
+#include "filesystem_include.hpp"
#include <type_traits>
#include <cassert>
@@ -23,7 +23,7 @@
#include "rapid-cxx-test.hpp"
#include "filesystem_test_helper.hpp"
-using namespace std::experimental::filesystem;
+using namespace fs;
TEST_SUITE(is_socket_test_suite)
Modified: libcxx/trunk/test/std/experimental/filesystem/fs.op.funcs/fs.op.is_symlink/is_symlink.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/experimental/filesystem/fs.op.funcs/fs.op.is_symlink/is_symlink.pass.cpp?rev=328475&r1=328474&r2=328475&view=diff
==============================================================================
--- libcxx/trunk/test/std/experimental/filesystem/fs.op.funcs/fs.op.is_symlink/is_symlink.pass.cpp (original)
+++ libcxx/trunk/test/std/experimental/filesystem/fs.op.funcs/fs.op.is_symlink/is_symlink.pass.cpp Sun Mar 25 22:46:57 2018
@@ -15,7 +15,7 @@
// bool is_symlink(path const& p);
// bool is_symlink(path const& p, std::error_code& ec) noexcept;
-#include <experimental/filesystem>
+#include "filesystem_include.hpp"
#include <type_traits>
#include <cassert>
@@ -23,7 +23,7 @@
#include "rapid-cxx-test.hpp"
#include "filesystem_test_helper.hpp"
-using namespace std::experimental::filesystem;
+using namespace fs;
TEST_SUITE(is_symlink_test_suite)
Modified: libcxx/trunk/test/std/experimental/filesystem/fs.op.funcs/fs.op.last_write_time/last_write_time.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/experimental/filesystem/fs.op.funcs/fs.op.last_write_time/last_write_time.pass.cpp?rev=328475&r1=328474&r2=328475&view=diff
==============================================================================
--- libcxx/trunk/test/std/experimental/filesystem/fs.op.funcs/fs.op.last_write_time/last_write_time.pass.cpp (original)
+++ libcxx/trunk/test/std/experimental/filesystem/fs.op.funcs/fs.op.last_write_time/last_write_time.pass.cpp Sun Mar 25 22:46:57 2018
@@ -18,7 +18,7 @@
// std::error_code& ec) noexcept;
-#include <experimental/filesystem>
+#include "filesystem_include.hpp"
#include <type_traits>
#include <chrono>
#include <fstream>
@@ -31,7 +31,7 @@
#include <sys/stat.h>
#include <iostream>
-using namespace std::experimental::filesystem;
+using namespace fs;
std::pair<std::time_t, std::time_t> GetTimes(path const& p) {
Modified: libcxx/trunk/test/std/experimental/filesystem/fs.op.funcs/fs.op.permissions/permissions.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/experimental/filesystem/fs.op.funcs/fs.op.permissions/permissions.pass.cpp?rev=328475&r1=328474&r2=328475&view=diff
==============================================================================
--- libcxx/trunk/test/std/experimental/filesystem/fs.op.funcs/fs.op.permissions/permissions.pass.cpp (original)
+++ libcxx/trunk/test/std/experimental/filesystem/fs.op.funcs/fs.op.permissions/permissions.pass.cpp Sun Mar 25 22:46:57 2018
@@ -15,14 +15,13 @@
// void permissions(const path& p, perms prms, std::error_code& ec) noexcept;
-#include <experimental/filesystem>
+#include "filesystem_include.hpp"
#include "test_macros.h"
#include "rapid-cxx-test.hpp"
#include "filesystem_test_helper.hpp"
-using namespace std::experimental::filesystem;
-namespace fs = std::experimental::filesystem;
+using namespace fs;
using PR = fs::perms;
Modified: libcxx/trunk/test/std/experimental/filesystem/fs.op.funcs/fs.op.read_symlink/read_symlink.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/experimental/filesystem/fs.op.funcs/fs.op.read_symlink/read_symlink.pass.cpp?rev=328475&r1=328474&r2=328475&view=diff
==============================================================================
--- libcxx/trunk/test/std/experimental/filesystem/fs.op.funcs/fs.op.read_symlink/read_symlink.pass.cpp (original)
+++ libcxx/trunk/test/std/experimental/filesystem/fs.op.funcs/fs.op.read_symlink/read_symlink.pass.cpp Sun Mar 25 22:46:57 2018
@@ -14,14 +14,13 @@
// path read_symlink(const path& p);
// path read_symlink(const path& p, error_code& ec);
-#include <experimental/filesystem>
+#include "filesystem_include.hpp"
#include "test_macros.h"
#include "rapid-cxx-test.hpp"
#include "filesystem_test_helper.hpp"
-using namespace std::experimental::filesystem;
-namespace fs = std::experimental::filesystem;
+using namespace fs;
TEST_SUITE(filesystem_read_symlink_test_suite)
Modified: libcxx/trunk/test/std/experimental/filesystem/fs.op.funcs/fs.op.remove/remove.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/experimental/filesystem/fs.op.funcs/fs.op.remove/remove.pass.cpp?rev=328475&r1=328474&r2=328475&view=diff
==============================================================================
--- libcxx/trunk/test/std/experimental/filesystem/fs.op.funcs/fs.op.remove/remove.pass.cpp (original)
+++ libcxx/trunk/test/std/experimental/filesystem/fs.op.funcs/fs.op.remove/remove.pass.cpp Sun Mar 25 22:46:57 2018
@@ -14,14 +14,13 @@
// bool remove(const path& p);
// bool remove(const path& p, error_code& ec) noexcept;
-#include <experimental/filesystem>
+#include "filesystem_include.hpp"
#include "test_macros.h"
#include "rapid-cxx-test.hpp"
#include "filesystem_test_helper.hpp"
-using namespace std::experimental::filesystem;
-namespace fs = std::experimental::filesystem;
+using namespace fs;
TEST_SUITE(filesystem_remove_test_suite)
Modified: libcxx/trunk/test/std/experimental/filesystem/fs.op.funcs/fs.op.remove_all/remove_all.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/experimental/filesystem/fs.op.funcs/fs.op.remove_all/remove_all.pass.cpp?rev=328475&r1=328474&r2=328475&view=diff
==============================================================================
--- libcxx/trunk/test/std/experimental/filesystem/fs.op.funcs/fs.op.remove_all/remove_all.pass.cpp (original)
+++ libcxx/trunk/test/std/experimental/filesystem/fs.op.funcs/fs.op.remove_all/remove_all.pass.cpp Sun Mar 25 22:46:57 2018
@@ -14,14 +14,13 @@
// uintmax_t remove_all(const path& p);
// uintmax_t remove_all(const path& p, error_code& ec) noexcept;
-#include <experimental/filesystem>
+#include "filesystem_include.hpp"
#include "test_macros.h"
#include "rapid-cxx-test.hpp"
#include "filesystem_test_helper.hpp"
-using namespace std::experimental::filesystem;
-namespace fs = std::experimental::filesystem;
+using namespace fs;
TEST_SUITE(filesystem_remove_all_test_suite)
Modified: libcxx/trunk/test/std/experimental/filesystem/fs.op.funcs/fs.op.rename/rename.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/experimental/filesystem/fs.op.funcs/fs.op.rename/rename.pass.cpp?rev=328475&r1=328474&r2=328475&view=diff
==============================================================================
--- libcxx/trunk/test/std/experimental/filesystem/fs.op.funcs/fs.op.rename/rename.pass.cpp (original)
+++ libcxx/trunk/test/std/experimental/filesystem/fs.op.funcs/fs.op.rename/rename.pass.cpp Sun Mar 25 22:46:57 2018
@@ -14,14 +14,13 @@
// void rename(const path& old_p, const path& new_p);
// void rename(const path& old_p, const path& new_p, error_code& ec) noexcept;
-#include <experimental/filesystem>
+#include "filesystem_include.hpp"
#include "test_macros.h"
#include "rapid-cxx-test.hpp"
#include "filesystem_test_helper.hpp"
-using namespace std::experimental::filesystem;
-namespace fs = std::experimental::filesystem;
+using namespace fs;
TEST_SUITE(filesystem_rename_test_suite)
Modified: libcxx/trunk/test/std/experimental/filesystem/fs.op.funcs/fs.op.resize_file/resize_file.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/experimental/filesystem/fs.op.funcs/fs.op.resize_file/resize_file.pass.cpp?rev=328475&r1=328474&r2=328475&view=diff
==============================================================================
--- libcxx/trunk/test/std/experimental/filesystem/fs.op.funcs/fs.op.resize_file/resize_file.pass.cpp (original)
+++ libcxx/trunk/test/std/experimental/filesystem/fs.op.funcs/fs.op.resize_file/resize_file.pass.cpp Sun Mar 25 22:46:57 2018
@@ -14,14 +14,13 @@
// void resize_file(const path& p, uintmax_t new_size);
// void resize_file(const path& p, uintmax_t new_size, error_code& ec) noexcept;
-#include <experimental/filesystem>
+#include "filesystem_include.hpp"
#include "test_macros.h"
#include "rapid-cxx-test.hpp"
#include "filesystem_test_helper.hpp"
-using namespace std::experimental::filesystem;
-namespace fs = std::experimental::filesystem;
+using namespace fs;
TEST_SUITE(filesystem_resize_file_test_suite)
Modified: libcxx/trunk/test/std/experimental/filesystem/fs.op.funcs/fs.op.space/space.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/experimental/filesystem/fs.op.funcs/fs.op.space/space.pass.cpp?rev=328475&r1=328474&r2=328475&view=diff
==============================================================================
--- libcxx/trunk/test/std/experimental/filesystem/fs.op.funcs/fs.op.space/space.pass.cpp (original)
+++ libcxx/trunk/test/std/experimental/filesystem/fs.op.funcs/fs.op.space/space.pass.cpp Sun Mar 25 22:46:57 2018
@@ -14,14 +14,14 @@
// space_info space(const path& p);
// space_info space(const path& p, error_code& ec) noexcept;
-#include <experimental/filesystem>
+#include "filesystem_include.hpp"
#include <sys/statvfs.h>
#include "test_macros.h"
#include "rapid-cxx-test.hpp"
#include "filesystem_test_helper.hpp"
-using namespace std::experimental::filesystem;
+using namespace fs;
bool EqualDelta(std::uintmax_t x, std::uintmax_t y, std::uintmax_t delta) {
if (x >= y) {
Modified: libcxx/trunk/test/std/experimental/filesystem/fs.op.funcs/fs.op.status/status.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/experimental/filesystem/fs.op.funcs/fs.op.status/status.pass.cpp?rev=328475&r1=328474&r2=328475&view=diff
==============================================================================
--- libcxx/trunk/test/std/experimental/filesystem/fs.op.funcs/fs.op.status/status.pass.cpp (original)
+++ libcxx/trunk/test/std/experimental/filesystem/fs.op.funcs/fs.op.status/status.pass.cpp Sun Mar 25 22:46:57 2018
@@ -14,13 +14,13 @@
// file_status status(const path& p);
// file_status status(const path& p, error_code& ec) noexcept;
-#include <experimental/filesystem>
+#include "filesystem_include.hpp"
#include "test_macros.h"
#include "rapid-cxx-test.hpp"
#include "filesystem_test_helper.hpp"
-using namespace std::experimental::filesystem;
+using namespace fs;
TEST_SUITE(filesystem_status_test_suite)
Modified: libcxx/trunk/test/std/experimental/filesystem/fs.op.funcs/fs.op.status_known/status_known.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/experimental/filesystem/fs.op.funcs/fs.op.status_known/status_known.pass.cpp?rev=328475&r1=328474&r2=328475&view=diff
==============================================================================
--- libcxx/trunk/test/std/experimental/filesystem/fs.op.funcs/fs.op.status_known/status_known.pass.cpp (original)
+++ libcxx/trunk/test/std/experimental/filesystem/fs.op.funcs/fs.op.status_known/status_known.pass.cpp Sun Mar 25 22:46:57 2018
@@ -13,7 +13,7 @@
// bool status_known(file_status s) noexcept;
-#include <experimental/filesystem>
+#include "filesystem_include.hpp"
#include <type_traits>
#include <cassert>
@@ -21,7 +21,7 @@
#include "rapid-cxx-test.hpp"
#include "filesystem_test_helper.hpp"
-using namespace std::experimental::filesystem;
+using namespace fs;
TEST_SUITE(status_known_test_suite)
Modified: libcxx/trunk/test/std/experimental/filesystem/fs.op.funcs/fs.op.symlink_status/symlink_status.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/experimental/filesystem/fs.op.funcs/fs.op.symlink_status/symlink_status.pass.cpp?rev=328475&r1=328474&r2=328475&view=diff
==============================================================================
--- libcxx/trunk/test/std/experimental/filesystem/fs.op.funcs/fs.op.symlink_status/symlink_status.pass.cpp (original)
+++ libcxx/trunk/test/std/experimental/filesystem/fs.op.funcs/fs.op.symlink_status/symlink_status.pass.cpp Sun Mar 25 22:46:57 2018
@@ -14,13 +14,13 @@
// file_status symlink_status(const path& p);
// file_status symlink_status(const path& p, error_code& ec) noexcept;
-#include <experimental/filesystem>
+#include "filesystem_include.hpp"
#include "test_macros.h"
#include "rapid-cxx-test.hpp"
#include "filesystem_test_helper.hpp"
-using namespace std::experimental::filesystem;
+using namespace fs;
TEST_SUITE(filesystem_symlink_status_test_suite)
Modified: libcxx/trunk/test/std/experimental/filesystem/fs.op.funcs/fs.op.system_complete/system_complete.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/experimental/filesystem/fs.op.funcs/fs.op.system_complete/system_complete.pass.cpp?rev=328475&r1=328474&r2=328475&view=diff
==============================================================================
--- libcxx/trunk/test/std/experimental/filesystem/fs.op.funcs/fs.op.system_complete/system_complete.pass.cpp (original)
+++ libcxx/trunk/test/std/experimental/filesystem/fs.op.funcs/fs.op.system_complete/system_complete.pass.cpp Sun Mar 25 22:46:57 2018
@@ -17,7 +17,7 @@
// Note: For POSIX based operating systems, 'system_complete(p)' has the
// same semantics as 'absolute(p, current_path())'.
-#include <experimental/filesystem>
+#include "filesystem_include.hpp"
#include <type_traits>
#include <cassert>
@@ -25,7 +25,7 @@
#include "rapid-cxx-test.hpp"
#include "filesystem_test_helper.hpp"
-using namespace std::experimental::filesystem;
+using namespace fs;
TEST_SUITE(filesystem_system_complete_test_suite)
Modified: libcxx/trunk/test/std/experimental/filesystem/fs.op.funcs/fs.op.temp_dir_path/temp_directory_path.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/experimental/filesystem/fs.op.funcs/fs.op.temp_dir_path/temp_directory_path.pass.cpp?rev=328475&r1=328474&r2=328475&view=diff
==============================================================================
--- libcxx/trunk/test/std/experimental/filesystem/fs.op.funcs/fs.op.temp_dir_path/temp_directory_path.pass.cpp (original)
+++ libcxx/trunk/test/std/experimental/filesystem/fs.op.funcs/fs.op.temp_dir_path/temp_directory_path.pass.cpp Sun Mar 25 22:46:57 2018
@@ -14,7 +14,7 @@
// path temp_directory_path();
// path temp_directory_path(error_code& ec);
-#include <experimental/filesystem>
+#include "filesystem_include.hpp"
#include <memory>
#include <cstdlib>
#include <cstring>
@@ -24,7 +24,7 @@
#include "rapid-cxx-test.hpp"
#include "filesystem_test_helper.hpp"
-using namespace std::experimental::filesystem;
+using namespace fs;
void PutEnv(std::string var, std::string value) {
assert(::setenv(var.c_str(), value.c_str(), /* overwrite */ 1) == 0);
Modified: libcxx/trunk/test/std/experimental/filesystem/fs.req.macros/feature_macro.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/experimental/filesystem/fs.req.macros/feature_macro.pass.cpp?rev=328475&r1=328474&r2=328475&view=diff
==============================================================================
--- libcxx/trunk/test/std/experimental/filesystem/fs.req.macros/feature_macro.pass.cpp (original)
+++ libcxx/trunk/test/std/experimental/filesystem/fs.req.macros/feature_macro.pass.cpp Sun Mar 25 22:46:57 2018
@@ -13,7 +13,7 @@
// #define __cpp_lib_experimental_filesystem 201406L
-#include <experimental/filesystem>
+#include "filesystem_include.hpp"
#ifndef __cpp_lib_experimental_filesystem
#error Filesystem feature test macro is not defined (__cpp_lib_experimental_filesystem)
Added: libcxx/trunk/test/support/filesystem_include.hpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/support/filesystem_include.hpp?rev=328475&view=auto
==============================================================================
--- libcxx/trunk/test/support/filesystem_include.hpp (added)
+++ libcxx/trunk/test/support/filesystem_include.hpp Sun Mar 25 22:46:57 2018
@@ -0,0 +1,18 @@
+#ifndef TEST_SUPPORT_FILESYSTEM_INCLUDE_HPP
+#define TEST_SUPPORT_FILESYSTEM_INCLUDE_HPP
+
+#include <ciso646>
+// Test against std::filesystem for STL's other than libc++
+#ifndef _LIBCPP_VERSION
+#define TEST_INCLUDE_STD_FILESYSTEM
+#endif
+
+#ifdef TEST_INCLUDE_STD_FILESYSTEM
+#include <filesystem>
+namespace fs = std::filesystem;
+#else
+#include <experimental/filesystem>
+namespace fs = std::experimental::filesystem;
+#endif
+
+#endif
Modified: libcxx/trunk/test/support/filesystem_test_helper.hpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/support/filesystem_test_helper.hpp?rev=328475&r1=328474&r2=328475&view=diff
==============================================================================
--- libcxx/trunk/test/support/filesystem_test_helper.hpp (original)
+++ libcxx/trunk/test/support/filesystem_test_helper.hpp Sun Mar 25 22:46:57 2018
@@ -1,7 +1,7 @@
#ifndef FILESYSTEM_TEST_HELPER_HPP
#define FILESYSTEM_TEST_HELPER_HPP
-#include <experimental/filesystem>
+#include "filesystem_include.hpp"
#include <cassert>
#include <cstdio> // for printf
#include <string>
@@ -9,7 +9,6 @@
#include <random>
#include <chrono>
-namespace fs = std::experimental::filesystem;
// static test helpers
More information about the cfe-commits
mailing list