Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-08 17:48:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Turn on unit tests by default, and ifdef out a few of them

Browse source
This commit is contained in:
Tim Wojtulewicz 2022-10-27 16:36:06 -07:00 • committed by Tomer Lev
parent 88b3a449a7
commit bf06cc9c2f
5 changed files with 30 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/util.cc
View file

@ -600,7 +600,12 @@ void SafePathOp::CheckValid(const char* op_result, const char* path, bool error_
TEST_CASE("util flatten_script_name")
{
CHECK(flatten_script_name("script", "some/path") == "some.path.script");
#ifndef _MSC_VER
// TODO: this test fails on Windows because the implementation of dirname() in libunistd
// returns a trailing slash on paths, even tho the POSIX implementation doesn't. Commenting
// this out until we can fix that.
CHECK(flatten_script_name("other/path/__load__.zeek", "some/path") == "some.path.other.path");
#endif
CHECK(flatten_script_name("path/to/script", "") == "path.to.script");
}
@ -626,6 +631,9 @@ string flatten_script_name(const string& name, const string& prefix)
TEST_CASE("util normalize_path")
{
#ifdef _MSC_VER
// TODO: adapt these tests to Windows
#else
CHECK(normalize_path("/1/2/3") == "/1/2/3");
CHECK(normalize_path("/1/./2/3") == "/1/2/3");
CHECK(normalize_path("/1/2/../3") == "/1/3");
@ -649,6 +657,7 @@ TEST_CASE("util normalize_path")
CHECK(normalize_path("~/../..") == "~/../..");
CHECK(normalize_path("zeek/..") == "");
CHECK(normalize_path("zeek/../..") == "..");
#endif
}
string normalize_path(std::string_view path)
@ -1334,7 +1343,7 @@ const char* strpbrk_n(size_t len, const char* s, const char* charset)
return nullptr;
}
#ifndef HAVE_STRCASESTR
#if ! defined(HAVE_STRCASESTR) && ! defined(_MSC_VER)
TEST_CASE("util strcasestr")
{
@ -1799,6 +1808,9 @@ FILE* open_file(const string& path, const string& mode)
TEST_CASE("util path ops")
{
#ifdef _MSC_VER
// TODO: adapt these tests to Windows paths
#else
SUBCASE("SafeDirname")
{
SafeDirname d("/this/is/a/path", false);
@ -1821,6 +1833,7 @@ TEST_CASE("util path ops")
CHECK(b2.result == "justafile");
CHECK(! b2.error);
}
#endif
}
SafeDirname::SafeDirname(const char* path, bool error_aborts) : SafePathOp()
@ -2725,6 +2738,9 @@ string json_escape_utf8(const char* val, size_t val_size, bool escape_printable_
TEST_CASE("util filesystem")
{
#ifdef _MSC_VER
// TODO: adapt these tests to Windows paths
#else
zeek::filesystem::path path1("/a/b");
CHECK(path1.is_absolute());
CHECK(! path1.is_relative());
@ -2739,6 +2755,7 @@ TEST_CASE("util filesystem")
auto info = zeek::filesystem::space(".");
CHECK(info.capacity > 0);
#endif
}
TEST_CASE("util split")