aboutsummaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorKaren Arutyunov <karen@codesynthesis.com>2018-11-23 00:23:23 +0300
committerKaren Arutyunov <karen@codesynthesis.com>2018-11-30 17:13:11 +0300
commitabfee51c362cb1ed2e8eb62fec12b3eb5ca03fb0 (patch)
tree3f08e73ecc447a9d05d340eeab169affb9e517b6 /tests
parentb55143ecaa986aa3ba93dc6a078ed7d9cf495b1c (diff)
Add match_absent flag for path_{search,match}() functions
Diffstat (limited to 'tests')
-rw-r--r--tests/wildcard/driver.cxx29
-rw-r--r--tests/wildcard/testscript81
2 files changed, 101 insertions, 9 deletions
diff --git a/tests/wildcard/driver.cxx b/tests/wildcard/driver.cxx
index cecee07..f5fb346 100644
--- a/tests/wildcard/driver.cxx
+++ b/tests/wildcard/driver.cxx
@@ -48,8 +48,8 @@ int _CRT_glob = 0;
// Usages:
//
// argv[0] -mn <pattern> <name>
-// argv[0] -sd [-n] <pattern> [<dir>]
-// argv[0] -sp [-n] <pattern> <path> [<dir>]
+// argv[0] -sd [-i] [-n] <pattern> [<dir>]
+// argv[0] -sp [-i] [-n] <pattern> <path> [<dir>]
//
// Execute actions specified by the first option. Exit with code 0 if succeed,
// 1 if fail, 2 on the underlying OS error (print error description to STDERR).
@@ -73,6 +73,11 @@ int _CRT_glob = 0;
// through contains only the specified entry. The start directory is used if
// the first pattern component is a self-matching wildcard.
//
+// -i
+// Pass psflags::ignorable_components to the match/search functions.
+// Meaningful in combination with -sd or -sp options and must follow it, if
+// specified in the command line.
+//
// -n
// Do not sort paths found. Meaningful in combination with -sd or -sp
// options and must follow it, if specified in the command line.
@@ -100,12 +105,16 @@ try
assert (argc >= (op == "-sd" ? 3 : 4));
bool sort (true);
+ path_match_flags flags (path_match_flags::follow_symlinks);
+
int i (2);
for (; i != argc; ++i)
{
string o (argv[i]);
if (o == "-n")
sort = false;
+ else if (o == "-i")
+ flags |= path_match_flags::match_absent;
else
break; // End of options.
}
@@ -168,9 +177,9 @@ try
};
if (!entry)
- path_search (pattern, add, start);
+ path_search (pattern, add, start, flags);
else
- path_search (pattern, *entry, add, start);
+ path_search (pattern, *entry, add, start, flags);
// It the search succeeds, then test search in the directory tree
// represented by each matched path. Otherwise, if the directory tree is
@@ -185,13 +194,15 @@ try
//
size_t match_count (0);
- auto check = [&p, &match_count] (path&& pe, const string&, bool inter)
+ auto check = [&p, &match_count, flags]
+ (path&& pe, const string&, bool inter)
{
if (pe == p.first)
{
if (!inter)
++match_count;
- else
+ else if ((flags & path_match_flags::match_absent) ==
+ path_match_flags::none)
// For self-matching the callback is first called in the interim
// mode (through the preopen function) with an empty path.
//
@@ -201,16 +212,16 @@ try
return true;
};
- path_search (pattern, p.first, check, start);
+ path_search (pattern, p.first, check, start, flags);
assert (match_count == p.second);
// Test path match.
//
- assert (path_match (pattern, p.first, start));
+ assert (path_match (pattern, p.first, start, flags));
}
}
else if (entry)
- assert (!path_match (pattern, *entry, start));
+ assert (!path_match (pattern, *entry, start, flags));
// Print the found paths.
//
diff --git a/tests/wildcard/testscript b/tests/wildcard/testscript
index 0129809..885a7d5 100644
--- a/tests/wildcard/testscript
+++ b/tests/wildcard/testscript
@@ -1150,4 +1150,85 @@
}
}
}
+
+ : ignorable-components
+ :
+ {
+ test.options += -i
+
+ : middle
+ :
+ {
+ $* a/*/b a/b >/ a/b
+ $* a/*/b a/x/b >/ a/x/b
+ $* a/**/b a/b >/ a/b
+ $* a/**/b a/x/b >/ a/x/b
+
+ $* a/***/b a/b >>/EOE
+ a/b
+ a/b
+ EOE
+ }
+
+ : top-level
+ :
+ if ($cxx.target.class != 'windows')
+ {
+ $* -n /*/a /a > /a
+ $* -n /*/a /b/a > /b/a
+ }
+
+ : leading
+ :
+ {
+ $* -n */a a >/ a
+ $* -n */a b/a >/ b/a
+ }
+
+ : trailing
+ :
+ {
+ : file
+ :
+ {
+ $* -n a/* a >/ a
+ $* -n a/* a/b >/ a/b
+
+ $* -n a/* a/ == 1
+ $* -n a/* a/b/ == 1
+ }
+
+ : dir
+ :
+ {
+ $* -n a/*/ a/ >/ a/
+ $* -n a/*/ a/b >/ a/
+
+ $* -n a/*/ a/b/ >>/EOE
+ a/b/
+ a/
+ EOE
+
+ $* -n a/*/ a == 1
+ }
+ }
+
+ : leading-trailing
+ {
+ $* -n */* a >/ a
+ $* -n */* a/b >/ a/b
+
+ $* -n */a/* a >/ a
+ $* -n */a/* a/b >/ a/b
+ $* -n */a/* b/a >/ b/a
+ $* -n */a/* c/a/b >/ c/a/b
+
+ $* -n **/a/** a >/ a
+ $* -n **/a/** a/b/c/d >/ a/b/c/d
+ $* -n **/a/** d/c/b/a >/ d/c/b/a
+ $* -n **/a/** d/c/b/a/b/c/d >/ d/c/b/a/b/c/d
+ }
+
+
+ }
}