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.

git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@328475 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Eric Fiselier
2018-03-26 05:46:57 +00:00
parent 85e9de93e2
commit f1471a367b
109 changed files with 192 additions and 235 deletions

View File

@@ -18,11 +18,10 @@
// directory_entry(directory_entry&&) noexcept = default; // directory_entry(directory_entry&&) noexcept = default;
// explicit directory_entry(const path); // explicit directory_entry(const path);
#include <experimental/filesystem> #include "filesystem_include.hpp"
#include <type_traits> #include <type_traits>
#include <cassert> #include <cassert>
namespace fs = std::experimental::filesystem;
void test_default_ctor() void test_default_ctor()
{ {

View File

@@ -18,11 +18,10 @@
// void assign(path const&); // void assign(path const&);
// void replace_filename(path const&); // void replace_filename(path const&);
#include <experimental/filesystem> #include "filesystem_include.hpp"
#include <type_traits> #include <type_traits>
#include <cassert> #include <cassert>
namespace fs = std::experimental::filesystem;
void test_copy_assign_operator() void test_copy_assign_operator()
{ {

View File

@@ -21,11 +21,10 @@
// bool operator>=(directory_entry const&) const noexcept; // bool operator>=(directory_entry const&) const noexcept;
#include <experimental/filesystem> #include "filesystem_include.hpp"
#include <type_traits> #include <type_traits>
#include <cassert> #include <cassert>
namespace fs = std::experimental::filesystem;
#define CHECK_OP(Op) \ #define CHECK_OP(Op) \
static_assert(std::is_same<decltype(ce. operator Op (ce)), bool>::value, ""); \ static_assert(std::is_same<decltype(ce. operator Op (ce)), bool>::value, ""); \

View File

@@ -16,11 +16,10 @@
// const path& path() const noexcept; // const path& path() const noexcept;
// operator const path&() const noexcept; // operator const path&() const noexcept;
#include <experimental/filesystem> #include "filesystem_include.hpp"
#include <type_traits> #include <type_traits>
#include <cassert> #include <cassert>
namespace fs = std::experimental::filesystem;
void test_path_method() { void test_path_method() {
using namespace fs; using namespace fs;

View File

@@ -16,7 +16,7 @@
// file_status status() const; // file_status status() const;
// file_status status(error_code const&) const noexcept; // file_status status(error_code const&) const noexcept;
#include <experimental/filesystem> #include "filesystem_include.hpp"
#include <type_traits> #include <type_traits>
#include <cassert> #include <cassert>

View File

@@ -16,7 +16,7 @@
// file_status symlink_status() const; // file_status symlink_status() const;
// file_status symlink_status(error_code&) const noexcept; // file_status symlink_status(error_code&) const noexcept;
#include <experimental/filesystem> #include "filesystem_include.hpp"
#include <type_traits> #include <type_traits>
#include <cassert> #include <cassert>

View File

@@ -15,7 +15,7 @@
// directory_iterator(directory_iterator const&); // directory_iterator(directory_iterator const&);
#include <experimental/filesystem> #include "filesystem_include.hpp"
#include <type_traits> #include <type_traits>
#include <set> #include <set>
#include <cassert> #include <cassert>
@@ -24,7 +24,7 @@
#include "rapid-cxx-test.hpp" #include "rapid-cxx-test.hpp"
#include "filesystem_test_helper.hpp" #include "filesystem_test_helper.hpp"
using namespace std::experimental::filesystem; using namespace fs;
TEST_SUITE(directory_iterator_copy_construct_tests) TEST_SUITE(directory_iterator_copy_construct_tests)

View File

@@ -15,7 +15,7 @@
// directory_iterator& operator=(directory_iterator const&); // directory_iterator& operator=(directory_iterator const&);
#include <experimental/filesystem> #include "filesystem_include.hpp"
#include <type_traits> #include <type_traits>
#include <set> #include <set>
#include <cassert> #include <cassert>
@@ -24,7 +24,7 @@
#include "rapid-cxx-test.hpp" #include "rapid-cxx-test.hpp"
#include "filesystem_test_helper.hpp" #include "filesystem_test_helper.hpp"
using namespace std::experimental::filesystem; using namespace fs;
TEST_SUITE(directory_iterator_copy_assign_tests) TEST_SUITE(directory_iterator_copy_assign_tests)

View File

@@ -18,7 +18,7 @@
// directory_iterator(const path& p, error_code& ec); // directory_iterator(const path& p, error_code& ec);
// directory_iterator(const path& p, directory_options options, 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 <type_traits>
#include <set> #include <set>
#include <cassert> #include <cassert>
@@ -27,7 +27,7 @@
#include "rapid-cxx-test.hpp" #include "rapid-cxx-test.hpp"
#include "filesystem_test_helper.hpp" #include "filesystem_test_helper.hpp"
using namespace std::experimental::filesystem; using namespace fs;
TEST_SUITE(directory_iterator_constructor_tests) TEST_SUITE(directory_iterator_constructor_tests)
@@ -86,7 +86,7 @@ TEST_CASE(test_construction_from_bad_path)
TEST_CASE(access_denied_test_case) TEST_CASE(access_denied_test_case)
{ {
using namespace std::experimental::filesystem; using namespace fs;
scoped_test_env env; scoped_test_env env;
path const testDir = env.make_env_path("dir1"); path const testDir = env.make_env_path("dir1");
path const testFile = testDir / "testFile"; path const testFile = testDir / "testFile";
@@ -122,7 +122,7 @@ TEST_CASE(access_denied_test_case)
TEST_CASE(access_denied_to_file_test_case) TEST_CASE(access_denied_to_file_test_case)
{ {
using namespace std::experimental::filesystem; using namespace fs;
scoped_test_env env; scoped_test_env env;
path const testFile = env.make_env_path("file1"); path const testFile = env.make_env_path("file1");
env.create_file(testFile, 42); env.create_file(testFile, 42);

View File

@@ -16,13 +16,12 @@
// directory_iterator::directory_iterator() noexcept // directory_iterator::directory_iterator() noexcept
#include <experimental/filesystem> #include "filesystem_include.hpp"
#include <type_traits> #include <type_traits>
#include <cassert> #include <cassert>
#include "test_macros.h" #include "test_macros.h"
namespace fs = std::experimental::filesystem;
int main() { int main() {
{ {

View File

@@ -16,7 +16,7 @@
// directory_iterator& operator++(); // directory_iterator& operator++();
// directory_iterator& increment(error_code& ec); // directory_iterator& increment(error_code& ec);
#include <experimental/filesystem> #include "filesystem_include.hpp"
#include <type_traits> #include <type_traits>
#include <set> #include <set>
#include <cassert> #include <cassert>
@@ -26,7 +26,7 @@
#include "filesystem_test_helper.hpp" #include "filesystem_test_helper.hpp"
#include <iostream> #include <iostream>
using namespace std::experimental::filesystem; using namespace fs;
TEST_SUITE(directory_iterator_increment_tests) TEST_SUITE(directory_iterator_increment_tests)

View File

@@ -15,7 +15,7 @@
// directory_iterator(directory_iterator&&) noexcept; // directory_iterator(directory_iterator&&) noexcept;
#include <experimental/filesystem> #include "filesystem_include.hpp"
#include <type_traits> #include <type_traits>
#include <set> #include <set>
#include <cassert> #include <cassert>
@@ -24,7 +24,7 @@
#include "rapid-cxx-test.hpp" #include "rapid-cxx-test.hpp"
#include "filesystem_test_helper.hpp" #include "filesystem_test_helper.hpp"
using namespace std::experimental::filesystem; using namespace fs;
TEST_SUITE(directory_iterator_move_construct_tests) TEST_SUITE(directory_iterator_move_construct_tests)

View File

@@ -15,7 +15,7 @@
// directory_iterator& operator=(directory_iterator const&); // directory_iterator& operator=(directory_iterator const&);
#include <experimental/filesystem> #include "filesystem_include.hpp"
#include <type_traits> #include <type_traits>
#include <set> #include <set>
#include <cassert> #include <cassert>
@@ -30,7 +30,7 @@
#pragma clang diagnostic ignored "-Wself-move" #pragma clang diagnostic ignored "-Wself-move"
#endif #endif
using namespace std::experimental::filesystem; using namespace fs;
TEST_SUITE(directory_iterator_move_assign_tests) TEST_SUITE(directory_iterator_move_assign_tests)

View File

@@ -16,7 +16,7 @@
// directory_iterator begin(directory_iterator iter) noexcept; // directory_iterator begin(directory_iterator iter) noexcept;
// directory_iterator end(directory_iterator iter) noexcept; // directory_iterator end(directory_iterator iter) noexcept;
#include <experimental/filesystem> #include "filesystem_include.hpp"
#include <type_traits> #include <type_traits>
#include <set> #include <set>
#include <cassert> #include <cassert>
@@ -26,7 +26,7 @@
#include "filesystem_test_helper.hpp" #include "filesystem_test_helper.hpp"
#include <iostream> #include <iostream>
using namespace std::experimental::filesystem; using namespace fs;
TEST_SUITE(directory_iterator_begin_end_tests) TEST_SUITE(directory_iterator_begin_end_tests)

View File

@@ -19,13 +19,12 @@
// typedef ... reference; // typedef ... reference;
// typedef ... iterator_category // typedef ... iterator_category
#include <experimental/filesystem> #include "filesystem_include.hpp"
#include <type_traits> #include <type_traits>
#include <cassert> #include <cassert>
#include "test_macros.h" #include "test_macros.h"
namespace fs = std::experimental::filesystem;
int main() { int main() {
using namespace fs; using namespace fs;

View File

@@ -16,13 +16,12 @@
// explicit file_status() noexcept; // explicit file_status() noexcept;
// explicit file_status(file_type, perms prms = perms::unknown) noexcept; // explicit file_status(file_type, perms prms = perms::unknown) noexcept;
#include <experimental/filesystem> #include "filesystem_include.hpp"
#include <type_traits> #include <type_traits>
#include <cassert> #include <cassert>
#include "test_convertible.hpp" #include "test_convertible.hpp"
namespace fs = std::experimental::filesystem;
int main() { int main() {
using namespace fs; using namespace fs;

View File

@@ -16,11 +16,10 @@
// void type(file_type) noexcept; // void type(file_type) noexcept;
// void permissions(perms) noexcept; // void permissions(perms) noexcept;
#include <experimental/filesystem> #include "filesystem_include.hpp"
#include <type_traits> #include <type_traits>
#include <cassert> #include <cassert>
namespace fs = std::experimental::filesystem;
int main() { int main() {
using namespace fs; using namespace fs;

View File

@@ -16,11 +16,10 @@
// file_type type() const noexcept; // file_type type() const noexcept;
// perms permissions(p) const noexcept; // perms permissions(p) const noexcept;
#include <experimental/filesystem> #include "filesystem_include.hpp"
#include <type_traits> #include <type_traits>
#include <cassert> #include <cassert>
namespace fs = std::experimental::filesystem;
int main() { int main() {
using namespace fs; using namespace fs;

View File

@@ -21,13 +21,12 @@
// const path& path1() const noexcept; // const path& path1() const noexcept;
// const path& path2() const noexcept; // const path& path2() const noexcept;
#include <experimental/filesystem> #include "filesystem_include.hpp"
#include <type_traits> #include <type_traits>
#include <cassert> #include <cassert>
#include "test_macros.h" #include "test_macros.h"
namespace fs = std::experimental::filesystem;
void test_constructors() { void test_constructors() {
using namespace fs; using namespace fs;

View File

@@ -19,7 +19,7 @@
// path(InputIterator first, InputIterator last); // path(InputIterator first, InputIterator last);
#include <experimental/filesystem> #include "filesystem_include.hpp"
#include <iterator> #include <iterator>
#include <type_traits> #include <type_traits>
#include <cassert> #include <cassert>
@@ -27,7 +27,6 @@
#include "test_macros.h" #include "test_macros.h"
#include "filesystem_test_helper.hpp" #include "filesystem_test_helper.hpp"
namespace fs = std::experimental::filesystem;
template <class It> template <class It>

View File

@@ -22,7 +22,7 @@
// path& append(InputIterator first, InputIterator last); // path& append(InputIterator first, InputIterator last);
#include <experimental/filesystem> #include "filesystem_include.hpp"
#include <type_traits> #include <type_traits>
#include <string_view> #include <string_view>
#include <cassert> #include <cassert>
@@ -32,7 +32,6 @@
#include "count_new.hpp" #include "count_new.hpp"
#include "filesystem_test_helper.hpp" #include "filesystem_test_helper.hpp"
namespace fs = std::experimental::filesystem;
struct AppendOperatorTestcase { struct AppendOperatorTestcase {
MultiStringType lhs; MultiStringType lhs;

View File

@@ -15,14 +15,13 @@
// path& operator=(path const&); // path& operator=(path const&);
#include <experimental/filesystem> #include "filesystem_include.hpp"
#include <type_traits> #include <type_traits>
#include <cassert> #include <cassert>
#include "test_macros.h" #include "test_macros.h"
#include "count_new.hpp" #include "count_new.hpp"
namespace fs = std::experimental::filesystem;
int main() { int main() {
using namespace fs; using namespace fs;

View File

@@ -15,13 +15,12 @@
// path& operator=(path const&); // path& operator=(path const&);
#include <experimental/filesystem> #include "filesystem_include.hpp"
#include <type_traits> #include <type_traits>
#include <cassert> #include <cassert>
#include "test_macros.h" #include "test_macros.h"
namespace fs = std::experimental::filesystem;
int main() { int main() {
using namespace fs; using namespace fs;

View File

@@ -15,14 +15,13 @@
// path& operator=(path&&) noexcept // path& operator=(path&&) noexcept
#include <experimental/filesystem> #include "filesystem_include.hpp"
#include <type_traits> #include <type_traits>
#include <cassert> #include <cassert>
#include "test_macros.h" #include "test_macros.h"
#include "count_new.hpp" #include "count_new.hpp"
namespace fs = std::experimental::filesystem;
int main() { int main() {
using namespace fs; using namespace fs;

View File

@@ -22,7 +22,7 @@
// path& assign(InputIterator first, InputIterator last); // path& assign(InputIterator first, InputIterator last);
#include <experimental/filesystem> #include "filesystem_include.hpp"
#include <type_traits> #include <type_traits>
#include <string_view> #include <string_view>
#include <cassert> #include <cassert>
@@ -33,7 +33,6 @@
#include "filesystem_test_helper.hpp" #include "filesystem_test_helper.hpp"
#include <iostream> #include <iostream>
namespace fs = std::experimental::filesystem;
template <class CharT> template <class CharT>
void RunTestCase(MultiStringType const& MS) { void RunTestCase(MultiStringType const& MS) {

View File

@@ -26,7 +26,7 @@
// //
// size_t hash_value(path const&) noexcept; // size_t hash_value(path const&) noexcept;
#include <experimental/filesystem> #include "filesystem_include.hpp"
#include <type_traits> #include <type_traits>
#include <vector> #include <vector>
#include <cassert> #include <cassert>
@@ -36,7 +36,6 @@
#include "count_new.hpp" #include "count_new.hpp"
#include "filesystem_test_helper.hpp" #include "filesystem_test_helper.hpp"
namespace fs = std::experimental::filesystem;
struct PathCompareTest { struct PathCompareTest {
const char* LHS; const char* LHS;

View File

@@ -28,7 +28,7 @@
// path& concat(InputIterator first, InputIterator last); // path& concat(InputIterator first, InputIterator last);
#include <experimental/filesystem> #include "filesystem_include.hpp"
#include <type_traits> #include <type_traits>
#include <string> #include <string>
#include <string_view> #include <string_view>
@@ -39,7 +39,6 @@
#include "count_new.hpp" #include "count_new.hpp"
#include "filesystem_test_helper.hpp" #include "filesystem_test_helper.hpp"
namespace fs = std::experimental::filesystem;
struct ConcatOperatorTestcase { struct ConcatOperatorTestcase {
MultiStringType lhs; MultiStringType lhs;

View File

@@ -15,13 +15,12 @@
// path(path const&) // path(path const&)
#include <experimental/filesystem> #include "filesystem_include.hpp"
#include <type_traits> #include <type_traits>
#include <cassert> #include <cassert>
#include "test_macros.h" #include "test_macros.h"
namespace fs = std::experimental::filesystem;
int main() { int main() {
using namespace fs; using namespace fs;

View File

@@ -15,13 +15,12 @@
// path() noexcept // path() noexcept
#include <experimental/filesystem> #include "filesystem_include.hpp"
#include <type_traits> #include <type_traits>
#include <cassert> #include <cassert>
#include "test_macros.h" #include "test_macros.h"
namespace fs = std::experimental::filesystem;
int main() { int main() {
using namespace fs; using namespace fs;

View File

@@ -15,14 +15,13 @@
// path(path&&) noexcept // path(path&&) noexcept
#include <experimental/filesystem> #include "filesystem_include.hpp"
#include <type_traits> #include <type_traits>
#include <cassert> #include <cassert>
#include "test_macros.h" #include "test_macros.h"
#include "count_new.hpp" #include "count_new.hpp"
namespace fs = std::experimental::filesystem;
int main() { int main() {
using namespace fs; using namespace fs;

View File

@@ -19,7 +19,7 @@
// path(InputIterator first, InputIterator last); // path(InputIterator first, InputIterator last);
#include <experimental/filesystem> #include "filesystem_include.hpp"
#include <type_traits> #include <type_traits>
#include <cassert> #include <cassert>
@@ -28,7 +28,6 @@
#include "min_allocator.h" #include "min_allocator.h"
#include "filesystem_test_helper.hpp" #include "filesystem_test_helper.hpp"
namespace fs = std::experimental::filesystem;
template <class CharT> template <class CharT>
void RunTestCase(MultiStringType const& MS) { void RunTestCase(MultiStringType const& MS) {

View File

@@ -17,12 +17,11 @@
// UNSUPPORTED: c++98, c++03, c++11, c++14, c++17 // 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 // 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" #include "test_macros.h"
int main () int main ()
{ {
std::experimental::filesystem::path c; fs::path c;
c.empty(); // expected-error {{ignoring return value of function declared with 'nodiscard' attribute}} c.empty(); // expected-error {{ignoring return value of function declared with 'nodiscard' attribute}}
} }

View File

@@ -44,7 +44,7 @@
// iterator end() const; // iterator end() const;
#include <experimental/filesystem> #include "filesystem_include.hpp"
#include <type_traits> #include <type_traits>
#include <vector> #include <vector>
#include <cassert> #include <cassert>
@@ -54,7 +54,6 @@
#include "count_new.hpp" #include "count_new.hpp"
#include "filesystem_test_helper.hpp" #include "filesystem_test_helper.hpp"
namespace fs = std::experimental::filesystem;
struct PathDecomposeTestcase struct PathDecomposeTestcase
{ {
std::string raw; std::string raw;

View File

@@ -18,7 +18,7 @@
// basic_string<ECharT, Traits, Allocator> // basic_string<ECharT, Traits, Allocator>
// generic_string(const Allocator& a = Allocator()) const; // generic_string(const Allocator& a = Allocator()) const;
#include <experimental/filesystem> #include "filesystem_include.hpp"
#include <type_traits> #include <type_traits>
#include <cassert> #include <cassert>
@@ -28,7 +28,6 @@
#include "min_allocator.h" #include "min_allocator.h"
#include "filesystem_test_helper.hpp" #include "filesystem_test_helper.hpp"
namespace fs = std::experimental::filesystem;
MultiStringType longString = MKSTR("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ/123456789/abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"); MultiStringType longString = MKSTR("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ/123456789/abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ");

View File

@@ -20,7 +20,7 @@
// std::u32string generic_u32string() const; // std::u32string generic_u32string() const;
#include <experimental/filesystem> #include "filesystem_include.hpp"
#include <type_traits> #include <type_traits>
#include <cassert> #include <cassert>
@@ -30,7 +30,6 @@
#include "min_allocator.h" #include "min_allocator.h"
#include "filesystem_test_helper.hpp" #include "filesystem_test_helper.hpp"
namespace fs = std::experimental::filesystem;
MultiStringType longString = MKSTR("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ/123456789/abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"); MultiStringType longString = MKSTR("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ/123456789/abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ");

View File

@@ -15,7 +15,7 @@
// void clear() noexcept // void clear() noexcept
#include <experimental/filesystem> #include "filesystem_include.hpp"
#include <type_traits> #include <type_traits>
#include <cassert> #include <cassert>
@@ -24,7 +24,6 @@
#include "count_new.hpp" #include "count_new.hpp"
#include "filesystem_test_helper.hpp" #include "filesystem_test_helper.hpp"
namespace fs = std::experimental::filesystem;
int main() { int main() {
using namespace fs; using namespace fs;

View File

@@ -15,7 +15,7 @@
// path& make_preferred() // path& make_preferred()
#include <experimental/filesystem> #include "filesystem_include.hpp"
#include <type_traits> #include <type_traits>
#include <cassert> #include <cassert>
@@ -24,7 +24,6 @@
#include "count_new.hpp" #include "count_new.hpp"
#include "filesystem_test_helper.hpp" #include "filesystem_test_helper.hpp"
namespace fs = std::experimental::filesystem;
struct MakePreferredTestcase { struct MakePreferredTestcase {
const char* value; const char* value;

View File

@@ -15,7 +15,7 @@
// path& remove_filename() // path& remove_filename()
#include <experimental/filesystem> #include "filesystem_include.hpp"
#include <type_traits> #include <type_traits>
#include <cassert> #include <cassert>
@@ -24,7 +24,6 @@
#include "count_new.hpp" #include "count_new.hpp"
#include "filesystem_test_helper.hpp" #include "filesystem_test_helper.hpp"
namespace fs = std::experimental::filesystem;
struct RemoveFilenameTestcase { struct RemoveFilenameTestcase {
const char* value; const char* value;

View File

@@ -15,7 +15,7 @@
// path& replace_extension(path const& p = path()) // path& replace_extension(path const& p = path())
#include <experimental/filesystem> #include "filesystem_include.hpp"
#include <type_traits> #include <type_traits>
#include <cassert> #include <cassert>
@@ -24,7 +24,6 @@
#include "count_new.hpp" #include "count_new.hpp"
#include "filesystem_test_helper.hpp" #include "filesystem_test_helper.hpp"
namespace fs = std::experimental::filesystem;
struct ReplaceExtensionTestcase { struct ReplaceExtensionTestcase {
const char* value; const char* value;

View File

@@ -15,7 +15,7 @@
// path& replace_filename() // path& replace_filename()
#include <experimental/filesystem> #include "filesystem_include.hpp"
#include <type_traits> #include <type_traits>
#include <cassert> #include <cassert>
@@ -24,7 +24,6 @@
#include "count_new.hpp" #include "count_new.hpp"
#include "filesystem_test_helper.hpp" #include "filesystem_test_helper.hpp"
namespace fs = std::experimental::filesystem;
struct ReplaceFilenameTestcase { struct ReplaceFilenameTestcase {
const char* value; const char* value;

View File

@@ -15,7 +15,7 @@
// void swap(path& rhs) noexcept; // void swap(path& rhs) noexcept;
#include <experimental/filesystem> #include "filesystem_include.hpp"
#include <type_traits> #include <type_traits>
#include <cassert> #include <cassert>
@@ -24,7 +24,6 @@
#include "count_new.hpp" #include "count_new.hpp"
#include "filesystem_test_helper.hpp" #include "filesystem_test_helper.hpp"
namespace fs = std::experimental::filesystem;
struct SwapTestcase { struct SwapTestcase {
const char* value1; const char* value1;

View File

@@ -16,14 +16,13 @@
// const value_type* c_str() const noexcept; // const value_type* c_str() const noexcept;
#include <experimental/filesystem> #include "filesystem_include.hpp"
#include <type_traits> #include <type_traits>
#include <cassert> #include <cassert>
#include "test_macros.h" #include "test_macros.h"
#include "filesystem_test_helper.hpp" #include "filesystem_test_helper.hpp"
namespace fs = std::experimental::filesystem;
int main() int main()
{ {

View File

@@ -20,7 +20,7 @@
// std::u32string u32string() const; // std::u32string u32string() const;
#include <experimental/filesystem> #include "filesystem_include.hpp"
#include <type_traits> #include <type_traits>
#include <cassert> #include <cassert>
@@ -30,7 +30,6 @@
#include "min_allocator.h" #include "min_allocator.h"
#include "filesystem_test_helper.hpp" #include "filesystem_test_helper.hpp"
namespace fs = std::experimental::filesystem;
MultiStringType longString = MKSTR("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ/123456789/abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"); MultiStringType longString = MKSTR("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ/123456789/abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ");

View File

@@ -15,14 +15,13 @@
// const string_type& native() const noexcept; // const string_type& native() const noexcept;
#include <experimental/filesystem> #include "filesystem_include.hpp"
#include <type_traits> #include <type_traits>
#include <cassert> #include <cassert>
#include "test_macros.h" #include "test_macros.h"
#include "filesystem_test_helper.hpp" #include "filesystem_test_helper.hpp"
namespace fs = std::experimental::filesystem;
int main() int main()
{ {

View File

@@ -16,14 +16,13 @@
// operator string_type() const; // operator string_type() const;
#include <experimental/filesystem> #include "filesystem_include.hpp"
#include <type_traits> #include <type_traits>
#include <cassert> #include <cassert>
#include "test_macros.h" #include "test_macros.h"
#include "filesystem_test_helper.hpp" #include "filesystem_test_helper.hpp"
namespace fs = std::experimental::filesystem;
int main() int main()
{ {

View File

@@ -18,7 +18,7 @@
// basic_string<ECharT, Traits, Allocator> // basic_string<ECharT, Traits, Allocator>
// string(const Allocator& a = Allocator()) const; // string(const Allocator& a = Allocator()) const;
#include <experimental/filesystem> #include "filesystem_include.hpp"
#include <type_traits> #include <type_traits>
#include <cassert> #include <cassert>
@@ -28,7 +28,6 @@
#include "min_allocator.h" #include "min_allocator.h"
#include "filesystem_test_helper.hpp" #include "filesystem_test_helper.hpp"
namespace fs = std::experimental::filesystem;
// the SSO is always triggered for strings of size 2. // the SSO is always triggered for strings of size 2.
MultiStringType shortString = MKSTR("a"); MultiStringType shortString = MKSTR("a");

View File

@@ -13,14 +13,13 @@
// path operator/(path const&, path const&); // path operator/(path const&, path const&);
#include <experimental/filesystem> #include "filesystem_include.hpp"
#include <type_traits> #include <type_traits>
#include <cassert> #include <cassert>
#include "test_macros.h" #include "test_macros.h"
#include "filesystem_test_helper.hpp" #include "filesystem_test_helper.hpp"
namespace fs = std::experimental::filesystem;
// This is mainly tested via the member append functions. // This is mainly tested via the member append functions.
int main() int main()

View File

@@ -16,7 +16,7 @@
// template <class InputIter> // template <class InputIter>
// path u8path(InputIter, InputIter); // path u8path(InputIter, InputIter);
#include <experimental/filesystem> #include "filesystem_include.hpp"
#include <type_traits> #include <type_traits>
#include <cassert> #include <cassert>
@@ -25,7 +25,6 @@
#include "count_new.hpp" #include "count_new.hpp"
#include "filesystem_test_helper.hpp" #include "filesystem_test_helper.hpp"
namespace fs = std::experimental::filesystem;
int main() int main()
{ {

View File

@@ -22,7 +22,7 @@
// operator>>(basic_istream<charT, traits>& is, path& p) // operator>>(basic_istream<charT, traits>& is, path& p)
// //
#include <experimental/filesystem> #include "filesystem_include.hpp"
#include <type_traits> #include <type_traits>
#include <sstream> #include <sstream>
#include <cassert> #include <cassert>

View File

@@ -27,7 +27,7 @@
// passes. // passes.
// XFAIL: * // XFAIL: *
#include <experimental/filesystem> #include "filesystem_include.hpp"
#include <type_traits> #include <type_traits>
#include <sstream> #include <sstream>
#include <cassert> #include <cassert>

View File

@@ -13,7 +13,7 @@
// void swap(path& lhs, path& rhs) noexcept; // void swap(path& lhs, path& rhs) noexcept;
#include <experimental/filesystem> #include "filesystem_include.hpp"
#include <type_traits> #include <type_traits>
#include <cassert> #include <cassert>
@@ -21,7 +21,6 @@
#include "count_new.hpp" #include "count_new.hpp"
#include "filesystem_test_helper.hpp" #include "filesystem_test_helper.hpp"
namespace fs = std::experimental::filesystem;
// NOTE: this is tested in path.members/path.modifiers via the member swap. // NOTE: this is tested in path.members/path.modifiers via the member swap.
int main() int main()

View File

@@ -17,13 +17,12 @@
// typedef basic_string<value_type> string_type; // typedef basic_string<value_type> string_type;
// static constexpr value_type preferred_separator = ...; // static constexpr value_type preferred_separator = ...;
#include <experimental/filesystem> #include "filesystem_include.hpp"
#include <type_traits> #include <type_traits>
#include <cassert> #include <cassert>
#include "test_macros.h" #include "test_macros.h"
namespace fs = std::experimental::filesystem;
int main() { int main() {
using namespace fs; using namespace fs;

View File

@@ -15,7 +15,7 @@
// recursive_recursive_directory_iterator(recursive_recursive_directory_iterator const&); // recursive_recursive_directory_iterator(recursive_recursive_directory_iterator const&);
#include <experimental/filesystem> #include "filesystem_include.hpp"
#include <type_traits> #include <type_traits>
#include <set> #include <set>
#include <cassert> #include <cassert>
@@ -24,7 +24,7 @@
#include "rapid-cxx-test.hpp" #include "rapid-cxx-test.hpp"
#include "filesystem_test_helper.hpp" #include "filesystem_test_helper.hpp"
using namespace std::experimental::filesystem; using namespace fs;
TEST_SUITE(recursive_directory_iterator_copy_construct_tests) TEST_SUITE(recursive_directory_iterator_copy_construct_tests)

View File

@@ -15,7 +15,7 @@
// recursive_directory_iterator& operator=(recursive_directory_iterator const&); // recursive_directory_iterator& operator=(recursive_directory_iterator const&);
#include <experimental/filesystem> #include "filesystem_include.hpp"
#include <type_traits> #include <type_traits>
#include <set> #include <set>
#include <cassert> #include <cassert>
@@ -24,7 +24,7 @@
#include "rapid-cxx-test.hpp" #include "rapid-cxx-test.hpp"
#include "filesystem_test_helper.hpp" #include "filesystem_test_helper.hpp"
using namespace std::experimental::filesystem; using namespace fs;
TEST_SUITE(recursive_directory_iterator_copy_assign_tests) TEST_SUITE(recursive_directory_iterator_copy_assign_tests)

View File

@@ -20,7 +20,7 @@
// recursive_directory_iterator(const path& p, directory_options options, error_code& ec); // recursive_directory_iterator(const path& p, directory_options options, error_code& ec);
#include <experimental/filesystem> #include "filesystem_include.hpp"
#include <type_traits> #include <type_traits>
#include <set> #include <set>
#include <cassert> #include <cassert>
@@ -29,7 +29,7 @@
#include "rapid-cxx-test.hpp" #include "rapid-cxx-test.hpp"
#include "filesystem_test_helper.hpp" #include "filesystem_test_helper.hpp"
using namespace std::experimental::filesystem; using namespace fs;
using RDI = recursive_directory_iterator; using RDI = recursive_directory_iterator;
@@ -87,7 +87,7 @@ TEST_CASE(test_construction_from_bad_path)
TEST_CASE(access_denied_test_case) TEST_CASE(access_denied_test_case)
{ {
using namespace std::experimental::filesystem; using namespace fs;
scoped_test_env env; scoped_test_env env;
path const testDir = env.make_env_path("dir1"); path const testDir = env.make_env_path("dir1");
path const testFile = testDir / "testFile"; path const testFile = testDir / "testFile";
@@ -124,7 +124,7 @@ TEST_CASE(access_denied_test_case)
TEST_CASE(access_denied_to_file_test_case) TEST_CASE(access_denied_to_file_test_case)
{ {
using namespace std::experimental::filesystem; using namespace fs;
scoped_test_env env; scoped_test_env env;
path const testFile = env.make_env_path("file1"); path const testFile = env.make_env_path("file1");
env.create_file(testFile, 42); env.create_file(testFile, 42);

View File

@@ -15,7 +15,7 @@
// int depth() const // int depth() const
#include <experimental/filesystem> #include "filesystem_include.hpp"
#include <type_traits> #include <type_traits>
#include <set> #include <set>
#include <cassert> #include <cassert>
@@ -24,7 +24,7 @@
#include "rapid-cxx-test.hpp" #include "rapid-cxx-test.hpp"
#include "filesystem_test_helper.hpp" #include "filesystem_test_helper.hpp"
using namespace std::experimental::filesystem; using namespace fs;
TEST_SUITE(recursive_directory_iterator_depth_tests) TEST_SUITE(recursive_directory_iterator_depth_tests)

View File

@@ -15,7 +15,7 @@
// void disable_recursion_pending(); // void disable_recursion_pending();
#include <experimental/filesystem> #include "filesystem_include.hpp"
#include <type_traits> #include <type_traits>
#include <set> #include <set>
#include <cassert> #include <cassert>
@@ -24,7 +24,7 @@
#include "rapid-cxx-test.hpp" #include "rapid-cxx-test.hpp"
#include "filesystem_test_helper.hpp" #include "filesystem_test_helper.hpp"
using namespace std::experimental::filesystem; using namespace fs;
TEST_SUITE(recursive_directory_iterator_disable_recursion_pending_tests) TEST_SUITE(recursive_directory_iterator_disable_recursion_pending_tests)

View File

@@ -16,7 +16,7 @@
// recursive_directory_iterator& operator++(); // recursive_directory_iterator& operator++();
// recursive_directory_iterator& increment(error_code& ec) noexcept; // recursive_directory_iterator& increment(error_code& ec) noexcept;
#include <experimental/filesystem> #include "filesystem_include.hpp"
#include <type_traits> #include <type_traits>
#include <set> #include <set>
#include <cassert> #include <cassert>
@@ -25,7 +25,7 @@
#include "rapid-cxx-test.hpp" #include "rapid-cxx-test.hpp"
#include "filesystem_test_helper.hpp" #include "filesystem_test_helper.hpp"
using namespace std::experimental::filesystem; using namespace fs;
TEST_SUITE(recursive_directory_iterator_increment_tests) TEST_SUITE(recursive_directory_iterator_increment_tests)
@@ -140,7 +140,7 @@ TEST_CASE(test_follow_symlinks)
TEST_CASE(access_denied_on_recursion_test_case) TEST_CASE(access_denied_on_recursion_test_case)
{ {
using namespace std::experimental::filesystem; using namespace fs;
scoped_test_env env; scoped_test_env env;
const path testFiles[] = { const path testFiles[] = {
env.create_dir("dir1"), env.create_dir("dir1"),
@@ -239,7 +239,7 @@ TEST_CASE(access_denied_on_recursion_test_case)
// See llvm.org/PR35078 // See llvm.org/PR35078
TEST_CASE(test_PR35078) TEST_CASE(test_PR35078)
{ {
using namespace std::experimental::filesystem; using namespace fs;
scoped_test_env env; scoped_test_env env;
const path testFiles[] = { const path testFiles[] = {
env.create_dir("dir1"), env.create_dir("dir1"),
@@ -309,7 +309,7 @@ TEST_CASE(test_PR35078)
// See llvm.org/PR35078 // See llvm.org/PR35078
TEST_CASE(test_PR35078_with_symlink) TEST_CASE(test_PR35078_with_symlink)
{ {
using namespace std::experimental::filesystem; using namespace fs;
scoped_test_env env; scoped_test_env env;
const path testFiles[] = { const path testFiles[] = {
env.create_dir("dir1"), env.create_dir("dir1"),
@@ -393,7 +393,7 @@ TEST_CASE(test_PR35078_with_symlink)
// See llvm.org/PR35078 // See llvm.org/PR35078
TEST_CASE(test_PR35078_with_symlink_file) TEST_CASE(test_PR35078_with_symlink_file)
{ {
using namespace std::experimental::filesystem; using namespace fs;
scoped_test_env env; scoped_test_env env;
const path testFiles[] = { const path testFiles[] = {
env.create_dir("dir1"), env.create_dir("dir1"),

View File

@@ -15,7 +15,7 @@
// recursive_directory_iterator(recursive_directory_iterator&&) noexcept; // recursive_directory_iterator(recursive_directory_iterator&&) noexcept;
#include <experimental/filesystem> #include "filesystem_include.hpp"
#include <type_traits> #include <type_traits>
#include <set> #include <set>
#include <cassert> #include <cassert>
@@ -24,7 +24,7 @@
#include "rapid-cxx-test.hpp" #include "rapid-cxx-test.hpp"
#include "filesystem_test_helper.hpp" #include "filesystem_test_helper.hpp"
using namespace std::experimental::filesystem; using namespace fs;
TEST_SUITE(recursive_directory_iterator_move_construct_tests) TEST_SUITE(recursive_directory_iterator_move_construct_tests)

View File

@@ -15,7 +15,7 @@
// recursive_directory_iterator& operator=(recursive_directory_iterator const&); // recursive_directory_iterator& operator=(recursive_directory_iterator const&);
#include <experimental/filesystem> #include "filesystem_include.hpp"
#include <type_traits> #include <type_traits>
#include <set> #include <set>
#include <cassert> #include <cassert>
@@ -30,7 +30,7 @@
#pragma clang diagnostic ignored "-Wself-move" #pragma clang diagnostic ignored "-Wself-move"
#endif #endif
using namespace std::experimental::filesystem; using namespace fs;
TEST_SUITE(recursive_directory_iterator_move_assign_tests) TEST_SUITE(recursive_directory_iterator_move_assign_tests)

View File

@@ -16,7 +16,7 @@
// void pop(); // void pop();
// void pop(error_code& ec); // void pop(error_code& ec);
#include <experimental/filesystem> #include "filesystem_include.hpp"
#include <set> #include <set>
#include <cassert> #include <cassert>
@@ -24,7 +24,7 @@
#include "rapid-cxx-test.hpp" #include "rapid-cxx-test.hpp"
#include "filesystem_test_helper.hpp" #include "filesystem_test_helper.hpp"
using namespace std::experimental::filesystem; using namespace fs;
TEST_SUITE(recursive_directory_iterator_pop_tests) TEST_SUITE(recursive_directory_iterator_pop_tests)

View File

@@ -15,7 +15,7 @@
// bool recursion_pending() const; // bool recursion_pending() const;
#include <experimental/filesystem> #include "filesystem_include.hpp"
#include <type_traits> #include <type_traits>
#include <set> #include <set>
#include <cassert> #include <cassert>
@@ -24,7 +24,7 @@
#include "rapid-cxx-test.hpp" #include "rapid-cxx-test.hpp"
#include "filesystem_test_helper.hpp" #include "filesystem_test_helper.hpp"
using namespace std::experimental::filesystem; using namespace fs;
TEST_SUITE(recursive_directory_iterator_recursion_pending_tests) TEST_SUITE(recursive_directory_iterator_recursion_pending_tests)

View File

@@ -16,7 +16,7 @@
// recursive_directory_iterator begin(recursive_directory_iterator iter) noexcept; // recursive_directory_iterator begin(recursive_directory_iterator iter) noexcept;
// recursive_directory_iterator end(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 <type_traits>
#include <set> #include <set>
#include <cassert> #include <cassert>
@@ -26,7 +26,7 @@
#include "filesystem_test_helper.hpp" #include "filesystem_test_helper.hpp"
#include <iostream> #include <iostream>
using namespace std::experimental::filesystem; using namespace fs;
TEST_SUITE(recursive_directory_iterator_begin_end_tests) TEST_SUITE(recursive_directory_iterator_begin_end_tests)

View File

@@ -13,14 +13,13 @@
// enum class copy_options; // enum class copy_options;
#include <experimental/filesystem> #include "filesystem_include.hpp"
#include <type_traits> #include <type_traits>
#include <cassert> #include <cassert>
#include "check_bitmask_types.hpp" #include "check_bitmask_types.hpp"
#include "test_macros.h" #include "test_macros.h"
namespace fs = std::experimental::filesystem;
constexpr fs::copy_options ME(int val) { return static_cast<fs::copy_options>(val); } constexpr fs::copy_options ME(int val) { return static_cast<fs::copy_options>(val); }

View File

@@ -13,7 +13,7 @@
// enum class directory_options; // enum class directory_options;
#include <experimental/filesystem> #include "filesystem_include.hpp"
#include <type_traits> #include <type_traits>
#include <cassert> #include <cassert>
#include <sys/stat.h> #include <sys/stat.h>
@@ -21,7 +21,6 @@
#include "test_macros.h" #include "test_macros.h"
#include "check_bitmask_types.hpp" #include "check_bitmask_types.hpp"
namespace fs = std::experimental::filesystem;
constexpr fs::directory_options ME(int val) { return static_cast<fs::directory_options>(val); } constexpr fs::directory_options ME(int val) { return static_cast<fs::directory_options>(val); }

View File

@@ -13,13 +13,12 @@
// enum class file_type; // enum class file_type;
#include <experimental/filesystem> #include "filesystem_include.hpp"
#include <type_traits> #include <type_traits>
#include <cassert> #include <cassert>
#include "test_macros.h" #include "test_macros.h"
namespace fs = std::experimental::filesystem;
constexpr fs::file_type ME(int val) { return static_cast<fs::file_type>(val); } constexpr fs::file_type ME(int val) { return static_cast<fs::file_type>(val); }

View File

@@ -13,7 +13,7 @@
// enum class perms; // enum class perms;
#include <experimental/filesystem> #include "filesystem_include.hpp"
#include <type_traits> #include <type_traits>
#include <cassert> #include <cassert>
#include <sys/stat.h> #include <sys/stat.h>
@@ -21,7 +21,6 @@
#include "test_macros.h" #include "test_macros.h"
#include "check_bitmask_types.hpp" #include "check_bitmask_types.hpp"
namespace fs = std::experimental::filesystem;
constexpr fs::perms ME(int val) { return static_cast<fs::perms>(val); } constexpr fs::perms ME(int val) { return static_cast<fs::perms>(val); }

View File

@@ -13,7 +13,7 @@
// typedef TrivialClock file_time_type; // typedef TrivialClock file_time_type;
#include <experimental/filesystem> #include "filesystem_include.hpp"
#include <chrono> #include <chrono>
#include <type_traits> #include <type_traits>
@@ -25,7 +25,7 @@ typedef std::chrono::time_point<ExpectedClock> ExpectedTimePoint;
int main() { int main() {
static_assert(std::is_same< static_assert(std::is_same<
std::experimental::filesystem::file_time_type, fs::file_time_type,
ExpectedTimePoint ExpectedTimePoint
>::value, ""); >::value, "");
} }

View File

@@ -13,7 +13,7 @@
// path absolute(const path& p, const path& base=current_path()); // path absolute(const path& p, const path& base=current_path());
#include <experimental/filesystem> #include "filesystem_include.hpp"
#include <type_traits> #include <type_traits>
#include <cassert> #include <cassert>
@@ -21,7 +21,7 @@
#include "rapid-cxx-test.hpp" #include "rapid-cxx-test.hpp"
#include "filesystem_test_helper.hpp" #include "filesystem_test_helper.hpp"
using namespace std::experimental::filesystem; using namespace fs;
TEST_SUITE(filesystem_absolute_path_test_suite) TEST_SUITE(filesystem_absolute_path_test_suite)

View File

@@ -15,7 +15,7 @@
// path canonical(const path& p, error_code& ec); // path canonical(const path& p, error_code& ec);
// path canonical(const path& p, const path& base, 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 <type_traits>
#include <cassert> #include <cassert>
@@ -23,7 +23,7 @@
#include "rapid-cxx-test.hpp" #include "rapid-cxx-test.hpp"
#include "filesystem_test_helper.hpp" #include "filesystem_test_helper.hpp"
using namespace std::experimental::filesystem; using namespace fs;
TEST_SUITE(filesystem_canonical_path_test_suite) TEST_SUITE(filesystem_canonical_path_test_suite)

View File

@@ -17,7 +17,7 @@
// void copy(const path& from, const path& to, copy_options options, // void copy(const path& from, const path& to, copy_options options,
// error_code& ec); // error_code& ec);
#include <experimental/filesystem> #include "filesystem_include.hpp"
#include <type_traits> #include <type_traits>
#include <cstddef> #include <cstddef>
#include <cassert> #include <cassert>
@@ -26,8 +26,7 @@
#include "rapid-cxx-test.hpp" #include "rapid-cxx-test.hpp"
#include "filesystem_test_helper.hpp" #include "filesystem_test_helper.hpp"
using namespace std::experimental::filesystem; using namespace fs;
namespace fs = std::experimental::filesystem;
using CO = fs::copy_options; using CO = fs::copy_options;

View File

@@ -17,7 +17,7 @@
// bool copy_file(const path& from, const path& to, copy_options options, // bool copy_file(const path& from, const path& to, copy_options options,
// error_code& ec) noexcept; // error_code& ec) noexcept;
#include <experimental/filesystem> #include "filesystem_include.hpp"
#include <type_traits> #include <type_traits>
#include <chrono> #include <chrono>
#include <cassert> #include <cassert>
@@ -26,8 +26,7 @@
#include "rapid-cxx-test.hpp" #include "rapid-cxx-test.hpp"
#include "filesystem_test_helper.hpp" #include "filesystem_test_helper.hpp"
using namespace std::experimental::filesystem; using namespace fs;
namespace fs = std::experimental::filesystem;
using CO = fs::copy_options; using CO = fs::copy_options;

View File

@@ -15,7 +15,7 @@
// void copy_symlink(const path& existing_symlink, const path& new_symlink, // void copy_symlink(const path& existing_symlink, const path& new_symlink,
// error_code& ec) noexcept; // error_code& ec) noexcept;
#include <experimental/filesystem> #include "filesystem_include.hpp"
#include <type_traits> #include <type_traits>
#include <cassert> #include <cassert>
@@ -23,8 +23,7 @@
#include "rapid-cxx-test.hpp" #include "rapid-cxx-test.hpp"
#include "filesystem_test_helper.hpp" #include "filesystem_test_helper.hpp"
using namespace std::experimental::filesystem; using namespace fs;
namespace fs = std::experimental::filesystem;
TEST_SUITE(filesystem_copy_symlink_test_suite) TEST_SUITE(filesystem_copy_symlink_test_suite)

View File

@@ -14,7 +14,7 @@
// bool create_directories(const path& p); // bool create_directories(const path& p);
// bool create_directories(const path& p, error_code& ec) noexcept; // bool create_directories(const path& p, error_code& ec) noexcept;
#include <experimental/filesystem> #include "filesystem_include.hpp"
#include <type_traits> #include <type_traits>
#include <cassert> #include <cassert>
@@ -22,8 +22,7 @@
#include "rapid-cxx-test.hpp" #include "rapid-cxx-test.hpp"
#include "filesystem_test_helper.hpp" #include "filesystem_test_helper.hpp"
using namespace std::experimental::filesystem; using namespace fs;
namespace fs = std::experimental::filesystem;
TEST_SUITE(filesystem_create_directories_test_suite) TEST_SUITE(filesystem_create_directories_test_suite)

View File

@@ -16,7 +16,7 @@
// bool create_directory(const path& p, const path& attr); // bool create_directory(const path& p, const path& attr);
// bool create_directory(const path& p, const path& attr, error_code& ec) noexcept; // bool create_directory(const path& p, const path& attr, error_code& ec) noexcept;
#include <experimental/filesystem> #include "filesystem_include.hpp"
#include <type_traits> #include <type_traits>
#include <cassert> #include <cassert>
@@ -27,8 +27,7 @@
#include <sys/types.h> #include <sys/types.h>
#include <sys/stat.h> #include <sys/stat.h>
using namespace std::experimental::filesystem; using namespace fs;
namespace fs = std::experimental::filesystem;
fs::perms read_umask() { fs::perms read_umask() {
mode_t old_mask = umask(0); mode_t old_mask = umask(0);

View File

@@ -14,7 +14,7 @@
// bool create_directory(const path& p, const path& attr); // bool create_directory(const path& p, const path& attr);
// bool create_directory(const path& p, const path& attr, error_code& ec) noexcept; // bool create_directory(const path& p, const path& attr, error_code& ec) noexcept;
#include <experimental/filesystem> #include "filesystem_include.hpp"
#include <type_traits> #include <type_traits>
#include <cassert> #include <cassert>
@@ -22,8 +22,7 @@
#include "rapid-cxx-test.hpp" #include "rapid-cxx-test.hpp"
#include "filesystem_test_helper.hpp" #include "filesystem_test_helper.hpp"
using namespace std::experimental::filesystem; using namespace fs;
namespace fs = std::experimental::filesystem;
TEST_SUITE(filesystem_create_directory_test_suite) TEST_SUITE(filesystem_create_directory_test_suite)

View File

@@ -15,15 +15,14 @@
// void create_directory_symlink(const path& existing_symlink, const path& new_symlink, // void create_directory_symlink(const path& existing_symlink, const path& new_symlink,
// error_code& ec) noexcept; // error_code& ec) noexcept;
#include <experimental/filesystem> #include "filesystem_include.hpp"
#include <cassert> #include <cassert>
#include "test_macros.h" #include "test_macros.h"
#include "rapid-cxx-test.hpp" #include "rapid-cxx-test.hpp"
#include "filesystem_test_helper.hpp" #include "filesystem_test_helper.hpp"
using namespace std::experimental::filesystem; using namespace fs;
namespace fs = std::experimental::filesystem;
TEST_SUITE(filesystem_create_directory_symlink_test_suite) TEST_SUITE(filesystem_create_directory_symlink_test_suite)

View File

@@ -15,14 +15,13 @@
// void create_hard_link(const path& existing_symlink, const path& new_symlink, // void create_hard_link(const path& existing_symlink, const path& new_symlink,
// error_code& ec) noexcept; // error_code& ec) noexcept;
#include <experimental/filesystem> #include "filesystem_include.hpp"
#include "test_macros.h" #include "test_macros.h"
#include "rapid-cxx-test.hpp" #include "rapid-cxx-test.hpp"
#include "filesystem_test_helper.hpp" #include "filesystem_test_helper.hpp"
using namespace std::experimental::filesystem; using namespace fs;
namespace fs = std::experimental::filesystem;
TEST_SUITE(filesystem_create_hard_link_test_suite) TEST_SUITE(filesystem_create_hard_link_test_suite)

View File

@@ -15,15 +15,14 @@
// void create_symlink(const path& existing_symlink, const path& new_symlink, // void create_symlink(const path& existing_symlink, const path& new_symlink,
// error_code& ec) noexcept; // error_code& ec) noexcept;
#include <experimental/filesystem> #include "filesystem_include.hpp"
#include <cassert> #include <cassert>
#include "test_macros.h" #include "test_macros.h"
#include "rapid-cxx-test.hpp" #include "rapid-cxx-test.hpp"
#include "filesystem_test_helper.hpp" #include "filesystem_test_helper.hpp"
using namespace std::experimental::filesystem; using namespace fs;
namespace fs = std::experimental::filesystem;
TEST_SUITE(filesystem_create_symlink_test_suite) TEST_SUITE(filesystem_create_symlink_test_suite)

View File

@@ -16,7 +16,7 @@
// void current_path(path const&); // void current_path(path const&);
// void current_path(path const&, std::error_code& ec) noexcept; // void current_path(path const&, std::error_code& ec) noexcept;
#include <experimental/filesystem> #include "filesystem_include.hpp"
#include <type_traits> #include <type_traits>
#include <cassert> #include <cassert>
@@ -24,7 +24,7 @@
#include "rapid-cxx-test.hpp" #include "rapid-cxx-test.hpp"
#include "filesystem_test_helper.hpp" #include "filesystem_test_helper.hpp"
using namespace std::experimental::filesystem; using namespace fs;
TEST_SUITE(filesystem_current_path_path_test_suite) TEST_SUITE(filesystem_current_path_path_test_suite)

View File

@@ -14,7 +14,7 @@
// bool equivalent(path const& lhs, path const& rhs); // bool equivalent(path const& lhs, path const& rhs);
// bool equivalent(path const& lhs, path const& rhs, std::error_code& ec) noexcept; // bool equivalent(path const& lhs, path const& rhs, std::error_code& ec) noexcept;
#include <experimental/filesystem> #include "filesystem_include.hpp"
#include <type_traits> #include <type_traits>
#include <cassert> #include <cassert>
@@ -22,7 +22,7 @@
#include "rapid-cxx-test.hpp" #include "rapid-cxx-test.hpp"
#include "filesystem_test_helper.hpp" #include "filesystem_test_helper.hpp"
using namespace std::experimental::filesystem; using namespace fs;
TEST_SUITE(equivalent_test_suite) TEST_SUITE(equivalent_test_suite)

View File

@@ -15,7 +15,7 @@
// bool exists(path const& p); // bool exists(path const& p);
// bool exists(path const& p, std::error_code& ec) noexcept; // bool exists(path const& p, std::error_code& ec) noexcept;
#include <experimental/filesystem> #include "filesystem_include.hpp"
#include <type_traits> #include <type_traits>
#include <cassert> #include <cassert>
@@ -23,7 +23,7 @@
#include "rapid-cxx-test.hpp" #include "rapid-cxx-test.hpp"
#include "filesystem_test_helper.hpp" #include "filesystem_test_helper.hpp"
using namespace std::experimental::filesystem; using namespace fs;
TEST_SUITE(exists_test_suite) TEST_SUITE(exists_test_suite)

View File

@@ -14,7 +14,7 @@
// uintmax_t file_size(const path& p); // uintmax_t file_size(const path& p);
// uintmax_t file_size(const path& p, std::error_code& ec) noexcept; // uintmax_t file_size(const path& p, std::error_code& ec) noexcept;
#include <experimental/filesystem> #include "filesystem_include.hpp"
#include <type_traits> #include <type_traits>
#include <cassert> #include <cassert>
@@ -22,7 +22,7 @@
#include "rapid-cxx-test.hpp" #include "rapid-cxx-test.hpp"
#include "filesystem_test_helper.hpp" #include "filesystem_test_helper.hpp"
using namespace std::experimental::filesystem; using namespace fs;
TEST_SUITE(file_size_test_suite) TEST_SUITE(file_size_test_suite)

View File

@@ -14,7 +14,7 @@
// uintmax_t hard_link_count(const path& p); // uintmax_t hard_link_count(const path& p);
// uintmax_t hard_link_count(const path& p, std::error_code& ec) noexcept; // uintmax_t hard_link_count(const path& p, std::error_code& ec) noexcept;
#include <experimental/filesystem> #include "filesystem_include.hpp"
#include <type_traits> #include <type_traits>
#include <cassert> #include <cassert>
@@ -22,7 +22,7 @@
#include "rapid-cxx-test.hpp" #include "rapid-cxx-test.hpp"
#include "filesystem_test_helper.hpp" #include "filesystem_test_helper.hpp"
using namespace std::experimental::filesystem; using namespace fs;
TEST_SUITE(hard_link_count_test_suite) TEST_SUITE(hard_link_count_test_suite)

View File

@@ -15,7 +15,7 @@
// bool is_block_file(path const& p); // bool is_block_file(path const& p);
// bool is_block_file(path const& p, std::error_code& ec) noexcept; // bool is_block_file(path const& p, std::error_code& ec) noexcept;
#include <experimental/filesystem> #include "filesystem_include.hpp"
#include <type_traits> #include <type_traits>
#include <cassert> #include <cassert>
@@ -23,7 +23,7 @@
#include "rapid-cxx-test.hpp" #include "rapid-cxx-test.hpp"
#include "filesystem_test_helper.hpp" #include "filesystem_test_helper.hpp"
using namespace std::experimental::filesystem; using namespace fs;
TEST_SUITE(is_block_file_test_suite) TEST_SUITE(is_block_file_test_suite)

View File

@@ -15,7 +15,7 @@
// bool is_character_file(path const& p); // bool is_character_file(path const& p);
// bool is_character_file(path const& p, std::error_code& ec) noexcept; // bool is_character_file(path const& p, std::error_code& ec) noexcept;
#include <experimental/filesystem> #include "filesystem_include.hpp"
#include <type_traits> #include <type_traits>
#include <cassert> #include <cassert>
@@ -23,7 +23,7 @@
#include "rapid-cxx-test.hpp" #include "rapid-cxx-test.hpp"
#include "filesystem_test_helper.hpp" #include "filesystem_test_helper.hpp"
using namespace std::experimental::filesystem; using namespace fs;
TEST_SUITE(is_character_file_test_suite) TEST_SUITE(is_character_file_test_suite)

View File

@@ -15,7 +15,7 @@
// bool is_directory(path const& p); // bool is_directory(path const& p);
// bool is_directory(path const& p, std::error_code& ec) noexcept; // bool is_directory(path const& p, std::error_code& ec) noexcept;
#include <experimental/filesystem> #include "filesystem_include.hpp"
#include <type_traits> #include <type_traits>
#include <cassert> #include <cassert>
@@ -23,7 +23,7 @@
#include "rapid-cxx-test.hpp" #include "rapid-cxx-test.hpp"
#include "filesystem_test_helper.hpp" #include "filesystem_test_helper.hpp"
using namespace std::experimental::filesystem; using namespace fs;
TEST_SUITE(is_directory_test_suite) TEST_SUITE(is_directory_test_suite)

View File

@@ -14,7 +14,7 @@
// bool is_empty(path const& p); // bool is_empty(path const& p);
// bool is_empty(path const& p, std::error_code& ec); // bool is_empty(path const& p, std::error_code& ec);
#include <experimental/filesystem> #include "filesystem_include.hpp"
#include <type_traits> #include <type_traits>
#include <cassert> #include <cassert>
@@ -22,7 +22,7 @@
#include "rapid-cxx-test.hpp" #include "rapid-cxx-test.hpp"
#include "filesystem_test_helper.hpp" #include "filesystem_test_helper.hpp"
using namespace std::experimental::filesystem; using namespace fs;
TEST_SUITE(is_empty_test_suite) TEST_SUITE(is_empty_test_suite)

View File

@@ -15,7 +15,7 @@
// bool is_fifo(path const& p); // bool is_fifo(path const& p);
// bool is_fifo(path const& p, std::error_code& ec) noexcept; // bool is_fifo(path const& p, std::error_code& ec) noexcept;
#include <experimental/filesystem> #include "filesystem_include.hpp"
#include <type_traits> #include <type_traits>
#include <cassert> #include <cassert>
@@ -23,7 +23,7 @@
#include "rapid-cxx-test.hpp" #include "rapid-cxx-test.hpp"
#include "filesystem_test_helper.hpp" #include "filesystem_test_helper.hpp"
using namespace std::experimental::filesystem; using namespace fs;
TEST_SUITE(is_fifo_test_suite) TEST_SUITE(is_fifo_test_suite)

View File

@@ -15,7 +15,7 @@
// bool is_other(path const& p); // bool is_other(path const& p);
// bool is_other(path const& p, std::error_code& ec) noexcept; // bool is_other(path const& p, std::error_code& ec) noexcept;
#include <experimental/filesystem> #include "filesystem_include.hpp"
#include <type_traits> #include <type_traits>
#include <cassert> #include <cassert>
@@ -23,7 +23,7 @@
#include "rapid-cxx-test.hpp" #include "rapid-cxx-test.hpp"
#include "filesystem_test_helper.hpp" #include "filesystem_test_helper.hpp"
using namespace std::experimental::filesystem; using namespace fs;
TEST_SUITE(is_other_test_suite) TEST_SUITE(is_other_test_suite)

View File

@@ -15,7 +15,7 @@
// bool is_regular_file(path const& p); // bool is_regular_file(path const& p);
// bool is_regular_file(path const& p, std::error_code& ec) noexcept; // bool is_regular_file(path const& p, std::error_code& ec) noexcept;
#include <experimental/filesystem> #include "filesystem_include.hpp"
#include <type_traits> #include <type_traits>
#include <cassert> #include <cassert>
@@ -23,7 +23,7 @@
#include "rapid-cxx-test.hpp" #include "rapid-cxx-test.hpp"
#include "filesystem_test_helper.hpp" #include "filesystem_test_helper.hpp"
using namespace std::experimental::filesystem; using namespace fs;
TEST_SUITE(is_regular_file_test_suite) TEST_SUITE(is_regular_file_test_suite)

View File

@@ -15,7 +15,7 @@
// bool is_socket(path const& p); // bool is_socket(path const& p);
// bool is_socket(path const& p, std::error_code& ec) noexcept; // bool is_socket(path const& p, std::error_code& ec) noexcept;
#include <experimental/filesystem> #include "filesystem_include.hpp"
#include <type_traits> #include <type_traits>
#include <cassert> #include <cassert>
@@ -23,7 +23,7 @@
#include "rapid-cxx-test.hpp" #include "rapid-cxx-test.hpp"
#include "filesystem_test_helper.hpp" #include "filesystem_test_helper.hpp"
using namespace std::experimental::filesystem; using namespace fs;
TEST_SUITE(is_socket_test_suite) TEST_SUITE(is_socket_test_suite)

View File

@@ -15,7 +15,7 @@
// bool is_symlink(path const& p); // bool is_symlink(path const& p);
// bool is_symlink(path const& p, std::error_code& ec) noexcept; // bool is_symlink(path const& p, std::error_code& ec) noexcept;
#include <experimental/filesystem> #include "filesystem_include.hpp"
#include <type_traits> #include <type_traits>
#include <cassert> #include <cassert>
@@ -23,7 +23,7 @@
#include "rapid-cxx-test.hpp" #include "rapid-cxx-test.hpp"
#include "filesystem_test_helper.hpp" #include "filesystem_test_helper.hpp"
using namespace std::experimental::filesystem; using namespace fs;
TEST_SUITE(is_symlink_test_suite) TEST_SUITE(is_symlink_test_suite)

View File

@@ -18,7 +18,7 @@
// std::error_code& ec) noexcept; // std::error_code& ec) noexcept;
#include <experimental/filesystem> #include "filesystem_include.hpp"
#include <type_traits> #include <type_traits>
#include <chrono> #include <chrono>
#include <fstream> #include <fstream>
@@ -31,7 +31,7 @@
#include <sys/stat.h> #include <sys/stat.h>
#include <iostream> #include <iostream>
using namespace std::experimental::filesystem; using namespace fs;
std::pair<std::time_t, std::time_t> GetTimes(path const& p) { std::pair<std::time_t, std::time_t> GetTimes(path const& p) {

View File

@@ -15,14 +15,13 @@
// void permissions(const path& p, perms prms, std::error_code& ec) noexcept; // void permissions(const path& p, perms prms, std::error_code& ec) noexcept;
#include <experimental/filesystem> #include "filesystem_include.hpp"
#include "test_macros.h" #include "test_macros.h"
#include "rapid-cxx-test.hpp" #include "rapid-cxx-test.hpp"
#include "filesystem_test_helper.hpp" #include "filesystem_test_helper.hpp"
using namespace std::experimental::filesystem; using namespace fs;
namespace fs = std::experimental::filesystem;
using PR = fs::perms; using PR = fs::perms;

View File

@@ -14,14 +14,13 @@
// path read_symlink(const path& p); // path read_symlink(const path& p);
// path read_symlink(const path& p, error_code& ec); // path read_symlink(const path& p, error_code& ec);
#include <experimental/filesystem> #include "filesystem_include.hpp"
#include "test_macros.h" #include "test_macros.h"
#include "rapid-cxx-test.hpp" #include "rapid-cxx-test.hpp"
#include "filesystem_test_helper.hpp" #include "filesystem_test_helper.hpp"
using namespace std::experimental::filesystem; using namespace fs;
namespace fs = std::experimental::filesystem;
TEST_SUITE(filesystem_read_symlink_test_suite) TEST_SUITE(filesystem_read_symlink_test_suite)

View File

@@ -14,14 +14,13 @@
// bool remove(const path& p); // bool remove(const path& p);
// bool remove(const path& p, error_code& ec) noexcept; // bool remove(const path& p, error_code& ec) noexcept;
#include <experimental/filesystem> #include "filesystem_include.hpp"
#include "test_macros.h" #include "test_macros.h"
#include "rapid-cxx-test.hpp" #include "rapid-cxx-test.hpp"
#include "filesystem_test_helper.hpp" #include "filesystem_test_helper.hpp"
using namespace std::experimental::filesystem; using namespace fs;
namespace fs = std::experimental::filesystem;
TEST_SUITE(filesystem_remove_test_suite) TEST_SUITE(filesystem_remove_test_suite)

View File

@@ -14,14 +14,13 @@
// uintmax_t remove_all(const path& p); // uintmax_t remove_all(const path& p);
// uintmax_t remove_all(const path& p, error_code& ec) noexcept; // uintmax_t remove_all(const path& p, error_code& ec) noexcept;
#include <experimental/filesystem> #include "filesystem_include.hpp"
#include "test_macros.h" #include "test_macros.h"
#include "rapid-cxx-test.hpp" #include "rapid-cxx-test.hpp"
#include "filesystem_test_helper.hpp" #include "filesystem_test_helper.hpp"
using namespace std::experimental::filesystem; using namespace fs;
namespace fs = std::experimental::filesystem;
TEST_SUITE(filesystem_remove_all_test_suite) TEST_SUITE(filesystem_remove_all_test_suite)

View File

@@ -14,14 +14,13 @@
// void rename(const path& old_p, const path& new_p); // void rename(const path& old_p, const path& new_p);
// void rename(const path& old_p, const path& new_p, error_code& ec) noexcept; // 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 "test_macros.h"
#include "rapid-cxx-test.hpp" #include "rapid-cxx-test.hpp"
#include "filesystem_test_helper.hpp" #include "filesystem_test_helper.hpp"
using namespace std::experimental::filesystem; using namespace fs;
namespace fs = std::experimental::filesystem;
TEST_SUITE(filesystem_rename_test_suite) TEST_SUITE(filesystem_rename_test_suite)

View File

@@ -14,14 +14,13 @@
// void resize_file(const path& p, uintmax_t new_size); // void resize_file(const path& p, uintmax_t new_size);
// void resize_file(const path& p, uintmax_t new_size, error_code& ec) noexcept; // 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 "test_macros.h"
#include "rapid-cxx-test.hpp" #include "rapid-cxx-test.hpp"
#include "filesystem_test_helper.hpp" #include "filesystem_test_helper.hpp"
using namespace std::experimental::filesystem; using namespace fs;
namespace fs = std::experimental::filesystem;
TEST_SUITE(filesystem_resize_file_test_suite) TEST_SUITE(filesystem_resize_file_test_suite)

Some files were not shown because too many files have changed in this diff Show More