Skip to content
Snippets Groups Projects

Fix listing overrides in system-info with recent pressure-vessel

Merged Simon McVittie requested to merge wip/smcv/fix-listing-overrides into master
1 file
+ 13
2
Compare changes
  • Side-by-side
  • Inline
@@ -128,11 +128,12 @@ test_resolve_in_sysroot (Fixture *f,
@@ -128,11 +128,12 @@ test_resolve_in_sysroot (Fixture *f,
static const ResolveTest tests[] =
static const ResolveTest tests[] =
{
{
{ { "a/b/c/d" }, { "a/b/c/d" } },
{ { "a/b/c/d" }, { "a/b/c/d" } },
 
{ { "a/b/c/d/" }, { "a/b/c/d" } },
{
{
{ "a/b/c/d", SRT_RESOLVE_FLAGS_NONE, RESOLVE_CALL_FLAGS_IGNORE_PATH },
{ "a/b/c/d", SRT_RESOLVE_FLAGS_NONE, RESOLVE_CALL_FLAGS_IGNORE_PATH },
{ "a/b/c/d" },
{ "a/b/c/d" },
},
},
{ { "a/b/c/d", SRT_RESOLVE_FLAGS_MKDIR_P }, { "a/b/c/d" } },
{ { "a/b/c/d/", SRT_RESOLVE_FLAGS_MKDIR_P }, { "a/b/c/d" } },
{
{
{ "a/b/c/d", SRT_RESOLVE_FLAGS_MKDIR_P, RESOLVE_CALL_FLAGS_IGNORE_PATH },
{ "a/b/c/d", SRT_RESOLVE_FLAGS_MKDIR_P, RESOLVE_CALL_FLAGS_IGNORE_PATH },
{ "a/b/c/d" },
{ "a/b/c/d" },
@@ -150,10 +151,19 @@ test_resolve_in_sysroot (Fixture *f,
@@ -150,10 +151,19 @@ test_resolve_in_sysroot (Fixture *f,
{ "a/b/c/d" }
{ "a/b/c/d" }
},
},
{ { "a/b/c/file", SRT_RESOLVE_FLAGS_READABLE }, { "a/b/c/file" } },
{ { "a/b/c/file", SRT_RESOLVE_FLAGS_READABLE }, { "a/b/c/file" } },
 
{ { "a/b/c/file/" }, { NULL, G_IO_ERROR_NOT_DIRECTORY }},
{
{
{ "a/b/c/file", SRT_RESOLVE_FLAGS_DIRECTORY },
{ "a/b/c/file", SRT_RESOLVE_FLAGS_DIRECTORY },
{ NULL, G_IO_ERROR_NOT_DIRECTORY }
{ NULL, G_IO_ERROR_NOT_DIRECTORY }
},
},
 
{
 
{ "a/b/c/file/", SRT_RESOLVE_FLAGS_DIRECTORY },
 
{ NULL, G_IO_ERROR_NOT_DIRECTORY }
 
},
 
{
 
{ "a/b/c/file/", SRT_RESOLVE_FLAGS_READABLE },
 
{ NULL, G_IO_ERROR_NOT_DIRECTORY }
 
},
{
{
{ "a/b/c/file", SRT_RESOLVE_FLAGS_READABLE|SRT_RESOLVE_FLAGS_DIRECTORY },
{ "a/b/c/file", SRT_RESOLVE_FLAGS_READABLE|SRT_RESOLVE_FLAGS_DIRECTORY },
{ NULL, G_IO_ERROR_NOT_DIRECTORY }
{ NULL, G_IO_ERROR_NOT_DIRECTORY }
@@ -161,8 +171,9 @@ test_resolve_in_sysroot (Fixture *f,
@@ -161,8 +171,9 @@ test_resolve_in_sysroot (Fixture *f,
{ { "a/b///////.////./././///././c/d" }, { "a/b/c/d" } },
{ { "a/b///////.////./././///././c/d" }, { "a/b/c/d" } },
{ { "/a/b///////.////././../b2////././c2/d2" }, { "a/b2/c2/d2" } },
{ { "/a/b///////.////././../b2////././c2/d2" }, { "a/b2/c2/d2" } },
{ { "a/b/c/d/e/f" }, { NULL, G_IO_ERROR_NOT_FOUND } },
{ { "a/b/c/d/e/f" }, { NULL, G_IO_ERROR_NOT_FOUND } },
 
{ { "a/b/c/d/e/f/", SRT_RESOLVE_FLAGS_MKDIR_P }, { "a/b/c/d/e/f" } },
{ { "a/b/c/d/e/f", SRT_RESOLVE_FLAGS_MKDIR_P }, { "a/b/c/d/e/f" } },
{ { "a/b/c/d/e/f", SRT_RESOLVE_FLAGS_MKDIR_P }, { "a/b/c/d/e/f" } },
{ { "a/b/c/d/e/f" }, { "a/b/c/d/e/f" } },
{ { "a/b/c/d/e/f/" }, { "a/b/c/d/e/f" } },
{ { "a/b/c/d/e/f", SRT_RESOLVE_FLAGS_MKDIR_P }, { "a/b/c/d/e/f" } },
{ { "a/b/c/d/e/f", SRT_RESOLVE_FLAGS_MKDIR_P }, { "a/b/c/d/e/f" } },
{ { "a3/b3/c3" }, { NULL, G_IO_ERROR_NOT_FOUND } },
{ { "a3/b3/c3" }, { NULL, G_IO_ERROR_NOT_FOUND } },
{ { "a3/b3/c3", SRT_RESOLVE_FLAGS_MKDIR_P }, { "a3/b3/c3" } },
{ { "a3/b3/c3", SRT_RESOLVE_FLAGS_MKDIR_P }, { "a3/b3/c3" } },
Loading