* Patch based on a patch from Ethan to support relative matching in

  PageSpecs, by using "./". pagespec_match() has grown a new third parameter
  to support this.

1 files changed, 23 insertions, 18 deletions

diff --git a/t/pagespec_match.t b/t/pagespec_match.t
index bf6c8cbdf..1b8143577 100755
--- a/t/pagespec_match.t
+++ b/t/pagespec_match.t
@@ -1,29 +1,34 @@
 #!/usr/bin/perl
 use warnings;
 use strict;
-use Test::More tests => 35;
+use Test::More tests => 40;
 
 BEGIN { use_ok("IkiWiki"); }
 
-ok(pagespec_match("foo", "*"));
-ok(pagespec_match("page", "?ag?"));
-ok(! pagespec_match("page", "?a?g?"));
-ok(pagespec_match("foo.png", "*.*"));
-ok(! pagespec_match("foo", "*.*"));
-ok(pagespec_match("foo", "foo or bar"), "simple list");
-ok(pagespec_match("bar", "foo or bar"), "simple list 2");
-ok(pagespec_match("foo", "f?? and !foz"));
-ok(! pagespec_match("foo", "f?? and !foo"));
-ok(! pagespec_match("foo", "* and !foo"));
-ok(! pagespec_match("foo", "foo and !foo"));
-ok(! pagespec_match("foo.png", "* and !*.*"));
-ok(pagespec_match("foo", "(bar or ((meep and foo) or (baz or foo) or beep))"));
+ok(pagespec_match("foo", "*", ""));
+ok(pagespec_match("page", "?ag?", ""));
+ok(! pagespec_match("page", "?a?g?", ""));
+ok(pagespec_match("foo.png", "*.*", ""));
+ok(! pagespec_match("foo", "*.*", ""));
+ok(pagespec_match("foo", "foo or bar", ""), "simple list");
+ok(pagespec_match("bar", "foo or bar", ""), "simple list 2");
+ok(pagespec_match("foo", "f?? and !foz", ""));
+ok(! pagespec_match("foo", "f?? and !foo", ""));
+ok(! pagespec_match("foo", "* and !foo", ""));
+ok(! pagespec_match("foo", "foo and !foo", ""));
+ok(! pagespec_match("foo.png", "* and !*.*", ""));
+ok(pagespec_match("foo", "(bar or ((meep and foo) or (baz or foo) or beep))", ""));
+ok(! pagespec_match("foo/bar", "./*", "foo"), "relative fail");
+ok(! pagespec_match("a/foo", "./*", "a/b"), "relative");
+ok(! pagespec_match("a/b/foo", "./*", "a/b"), "relative fail");
+ok(! pagespec_match("foo", "./*", "a"), "relative toplevel");
+ok(pagespec_match("foo/bar", "*", "baz"), "absolute");
 
 $links{foo}=[qw{bar baz}];
-ok(pagespec_match("foo", "link(bar)"));
-ok(! pagespec_match("foo", "link(quux)"));
-ok(pagespec_match("bar", "backlink(foo)"));
-ok(! pagespec_match("quux", "backlink(foo)"));
+ok(pagespec_match("foo", "link(bar)", ""));
+ok(! pagespec_match("foo", "link(quux)", ""));
+ok(pagespec_match("bar", "backlink(foo)", ""));
+ok(! pagespec_match("quux", "backlink(foo)", ""));
 
 $IkiWiki::pagectime{foo}=1154532692; # Wed Aug  2 11:26 EDT 2006
 $IkiWiki::pagectime{bar}=1154532695; # after