Work on CI integration.

This commit is contained in:
Steffen Schuemann 2019-04-19 14:08:28 +02:00
parent 48d794e180
commit 8b222fc06f
2 changed files with 45 additions and 27 deletions

View File

@ -1,4 +1,5 @@
[![Build Status](https://travis-ci.org/gulrak/filesystem.svg?branch=master)](https://travis-ci.org/gulrak/filesystem) [![Build Status](https://travis-ci.org/gulrak/filesystem.svg?branch=master)](https://travis-ci.org/gulrak/filesystem)
[![Build status](https://ci.appveyor.com/api/projects/status/t07wp3k2cddo0hpo?svg=true)](https://ci.appveyor.com/project/gulrak/filesystem)
# Filesystem # Filesystem

View File

@ -1686,8 +1686,10 @@ TEST_CASE_METHOD(FileTypeMixFixture, "30.10.15.16 is_block_file", "[filesystem][
std::error_code ec; std::error_code ec;
CHECK(!fs::is_block_file("directory")); CHECK(!fs::is_block_file("directory"));
CHECK(!fs::is_block_file("regular")); CHECK(!fs::is_block_file("regular"));
if (is_symlink_creation_supported()) {
CHECK(!fs::is_block_file("dir_symlink")); CHECK(!fs::is_block_file("dir_symlink"));
CHECK(!fs::is_block_file("file_symlink")); CHECK(!fs::is_block_file("file_symlink"));
}
CHECK((has_fifo() ? !fs::is_block_file("fifo") : true)); CHECK((has_fifo() ? !fs::is_block_file("fifo") : true));
CHECK((has_socket() ? !fs::is_block_file("socket") : true)); CHECK((has_socket() ? !fs::is_block_file("socket") : true));
CHECK((block_path().empty() ? true : fs::is_block_file(block_path()))); CHECK((block_path().empty() ? true : fs::is_block_file(block_path())));
@ -1713,8 +1715,10 @@ TEST_CASE_METHOD(FileTypeMixFixture, "30.10.15.17 is_character_file", "[filesyst
std::error_code ec; std::error_code ec;
CHECK(!fs::is_character_file("directory")); CHECK(!fs::is_character_file("directory"));
CHECK(!fs::is_character_file("regular")); CHECK(!fs::is_character_file("regular"));
if (is_symlink_creation_supported()) {
CHECK(!fs::is_character_file("dir_symlink")); CHECK(!fs::is_character_file("dir_symlink"));
CHECK(!fs::is_character_file("file_symlink")); CHECK(!fs::is_character_file("file_symlink"));
}
CHECK((has_fifo() ? !fs::is_character_file("fifo") : true)); CHECK((has_fifo() ? !fs::is_character_file("fifo") : true));
CHECK((has_socket() ? !fs::is_character_file("socket") : true)); CHECK((has_socket() ? !fs::is_character_file("socket") : true));
CHECK((block_path().empty() ? true : !fs::is_character_file(block_path()))); CHECK((block_path().empty() ? true : !fs::is_character_file(block_path())));
@ -1740,8 +1744,10 @@ TEST_CASE_METHOD(FileTypeMixFixture, "30.10.15.18 is_directory", "[filesystem][o
std::error_code ec; std::error_code ec;
CHECK(fs::is_directory("directory")); CHECK(fs::is_directory("directory"));
CHECK(!fs::is_directory("regular")); CHECK(!fs::is_directory("regular"));
if (is_symlink_creation_supported()) {
CHECK(fs::is_directory("dir_symlink")); CHECK(fs::is_directory("dir_symlink"));
CHECK(!fs::is_directory("file_symlink")); CHECK(!fs::is_directory("file_symlink"));
}
CHECK((has_fifo() ? !fs::is_directory("fifo") : true)); CHECK((has_fifo() ? !fs::is_directory("fifo") : true));
CHECK((has_socket() ? !fs::is_directory("socket") : true)); CHECK((has_socket() ? !fs::is_directory("socket") : true));
CHECK((block_path().empty() ? true : !fs::is_directory(block_path()))); CHECK((block_path().empty() ? true : !fs::is_directory(block_path())));
@ -1789,8 +1795,10 @@ TEST_CASE_METHOD(FileTypeMixFixture, "30.10.15.20 is_fifo", "[filesystem][operat
std::error_code ec; std::error_code ec;
CHECK(!fs::is_fifo("directory")); CHECK(!fs::is_fifo("directory"));
CHECK(!fs::is_fifo("regular")); CHECK(!fs::is_fifo("regular"));
if (is_symlink_creation_supported()) {
CHECK(!fs::is_fifo("dir_symlink")); CHECK(!fs::is_fifo("dir_symlink"));
CHECK(!fs::is_fifo("file_symlink")); CHECK(!fs::is_fifo("file_symlink"));
}
CHECK((has_fifo() ? fs::is_fifo("fifo") : true)); CHECK((has_fifo() ? fs::is_fifo("fifo") : true));
CHECK((has_socket() ? !fs::is_fifo("socket") : true)); CHECK((has_socket() ? !fs::is_fifo("socket") : true));
CHECK((block_path().empty() ? true : !fs::is_fifo(block_path()))); CHECK((block_path().empty() ? true : !fs::is_fifo(block_path())));
@ -1816,8 +1824,10 @@ TEST_CASE_METHOD(FileTypeMixFixture, "30.10.15.21 is_other", "[filesystem][opera
std::error_code ec; std::error_code ec;
CHECK(!fs::is_other("directory")); CHECK(!fs::is_other("directory"));
CHECK(!fs::is_other("regular")); CHECK(!fs::is_other("regular"));
if (is_symlink_creation_supported()) {
CHECK(!fs::is_other("dir_symlink")); CHECK(!fs::is_other("dir_symlink"));
CHECK(!fs::is_other("file_symlink")); CHECK(!fs::is_other("file_symlink"));
}
CHECK((has_fifo() ? fs::is_other("fifo") : true)); CHECK((has_fifo() ? fs::is_other("fifo") : true));
CHECK((has_socket() ? fs::is_other("socket") : true)); CHECK((has_socket() ? fs::is_other("socket") : true));
CHECK((block_path().empty() ? true : fs::is_other(block_path()))); CHECK((block_path().empty() ? true : fs::is_other(block_path())));
@ -1843,8 +1853,10 @@ TEST_CASE_METHOD(FileTypeMixFixture, "30.10.15.22 is_regular_file", "[filesystem
std::error_code ec; std::error_code ec;
CHECK(!fs::is_regular_file("directory")); CHECK(!fs::is_regular_file("directory"));
CHECK(fs::is_regular_file("regular")); CHECK(fs::is_regular_file("regular"));
if (is_symlink_creation_supported()) {
CHECK(!fs::is_regular_file("dir_symlink")); CHECK(!fs::is_regular_file("dir_symlink"));
CHECK(fs::is_regular_file("file_symlink")); CHECK(fs::is_regular_file("file_symlink"));
}
CHECK((has_fifo() ? !fs::is_regular_file("fifo") : true)); CHECK((has_fifo() ? !fs::is_regular_file("fifo") : true));
CHECK((has_socket() ? !fs::is_regular_file("socket") : true)); CHECK((has_socket() ? !fs::is_regular_file("socket") : true));
CHECK((block_path().empty() ? true : !fs::is_regular_file(block_path()))); CHECK((block_path().empty() ? true : !fs::is_regular_file(block_path())));
@ -1870,8 +1882,10 @@ TEST_CASE_METHOD(FileTypeMixFixture, "30.10.15.23 is_socket", "[filesystem][oper
std::error_code ec; std::error_code ec;
CHECK(!fs::is_socket("directory")); CHECK(!fs::is_socket("directory"));
CHECK(!fs::is_socket("regular")); CHECK(!fs::is_socket("regular"));
if (is_symlink_creation_supported()) {
CHECK(!fs::is_socket("dir_symlink")); CHECK(!fs::is_socket("dir_symlink"));
CHECK(!fs::is_socket("file_symlink")); CHECK(!fs::is_socket("file_symlink"));
}
CHECK((has_fifo() ? !fs::is_socket("fifo") : true)); CHECK((has_fifo() ? !fs::is_socket("fifo") : true));
CHECK((has_socket() ? fs::is_socket("socket") : true)); CHECK((has_socket() ? fs::is_socket("socket") : true));
CHECK((block_path().empty() ? true : !fs::is_socket(block_path()))); CHECK((block_path().empty() ? true : !fs::is_socket(block_path())));
@ -1897,8 +1911,10 @@ TEST_CASE_METHOD(FileTypeMixFixture, "30.10.15.24 is_symlink", "[filesystem][ope
std::error_code ec; std::error_code ec;
CHECK(!fs::is_symlink("directory")); CHECK(!fs::is_symlink("directory"));
CHECK(!fs::is_symlink("regular")); CHECK(!fs::is_symlink("regular"));
if (is_symlink_creation_supported()) {
CHECK(fs::is_symlink("dir_symlink")); CHECK(fs::is_symlink("dir_symlink"));
CHECK(fs::is_symlink("file_symlink")); CHECK(fs::is_symlink("file_symlink"));
}
CHECK((has_fifo() ? !fs::is_symlink("fifo") : true)); CHECK((has_fifo() ? !fs::is_symlink("fifo") : true));
CHECK((has_socket() ? !fs::is_symlink("socket") : true)); CHECK((has_socket() ? !fs::is_symlink("socket") : true));
CHECK((block_path().empty() ? true : !fs::is_symlink(block_path()))); CHECK((block_path().empty() ? true : !fs::is_symlink(block_path())));
@ -2020,7 +2036,7 @@ TEST_CASE("30.10.15.27 proximate", "[filesystem][operations][fs.op.proximate]")
TEST_CASE("30.10.15.28 read_symlink", "[filesystem][operations][fs.op.read_symlink]") TEST_CASE("30.10.15.28 read_symlink", "[filesystem][operations][fs.op.read_symlink]")
{ {
REQUIRE(is_symlink_creation_supported()); if(is_symlink_creation_supported()) {
TemporaryDirectory t(TempOpt::change_path); TemporaryDirectory t(TempOpt::change_path);
std::error_code ec; std::error_code ec;
generateFile("foo"); generateFile("foo");
@ -2032,6 +2048,7 @@ TEST_CASE("30.10.15.28 read_symlink", "[filesystem][operations][fs.op.read_symli
CHECK(fs::read_symlink("foobar", ec) == fs::path()); CHECK(fs::read_symlink("foobar", ec) == fs::path());
CHECK(ec); CHECK(ec);
} }
}
TEST_CASE("30.10.15.29 relative", "[filesystem][operations][fs.op.relative]") TEST_CASE("30.10.15.29 relative", "[filesystem][operations][fs.op.relative]")
{ {