Rebuild for jessie-backports, no source changes (Closes: #807452)

[git.ikiwiki.info.git] / t / conflicts.t

diff --git a/t/conflicts.t b/t/conflicts.t
index 4664e1b6ed4e0404cdd40449de60c5380788fac5..fae0e84c9afda1365b14106313640e8e9aa5f889 100755 (executable)
--- a/t/conflicts.t
+++ b/t/conflicts.t
@@ -2,7 +2,7 @@
 # Tests for bugs relating to conflicting files in the srcdir
 use warnings;
 use strict;
 # Tests for bugs relating to conflicting files in the srcdir
 use warnings;
 use strict;

-use Test::More tests => 92;
+use Test::More tests => 106;

 
 # setup
 my $srcdir="t/tmp/src";
 
 # setup
 my $srcdir="t/tmp/src";


@@ -12,7 +12,7 @@ ok(! system("make -s ikiwiki.out"));
 # runs ikiwiki to build test site
 sub runiki {
        my $testdesc=shift;
 # runs ikiwiki to build test site
 sub runiki {
        my $testdesc=shift;

-       ok((! system("perl -I. ./ikiwiki.out -plugin txt -plugin rawhtml -underlaydir=underlays/basewiki -set underlaydirbase=underlays -templatedir=templates $srcdir $destdir @_")),
+       ok((! system("perl -I. ./ikiwiki.out --plugin txt --plugin rawhtml --underlaydir=underlays/basewiki --set underlaydirbase=underlays --templatedir=templates $srcdir $destdir @_")),

                $testdesc);
 }
 sub refreshiki {
                $testdesc);
 }
 sub refreshiki {


@@ -64,6 +64,19 @@ setupiki("initial setup");
 ok(! system("touch $srcdir/foo.mdwn"));
 refreshiki("conflicting non-page added (page already existing) in refresh");
 
 ok(! system("touch $srcdir/foo.mdwn"));
 refreshiki("conflicting non-page added (page already existing) in refresh");
 

+# Page that renders to a file that is also a subdirectory holding another
+# file.
+newsrcdir();
+ok(! system("touch $srcdir/foo.mdwn"));
+ok(! system("mkdir -p $srcdir/foo/index.html"));
+ok(! system("touch $srcdir/foo/index.html/bar.mdwn"));
+setupiki("conflicting page file and subdirectory");
+newsrcdir();
+ok(! system("touch $srcdir/foo.mdwn"));
+ok(! system("mkdir -p $srcdir/foo/index.html"));
+ok(! system("touch $srcdir/foo/index.html/bar"));
+setupiki("conflicting page file and subdirectory 2");
+

 # Changing a page file into a non-page could also cause ikiwiki to fail.
 newsrcdir();
 ok(! system("touch $srcdir/foo.mdwn"));
 # Changing a page file into a non-page could also cause ikiwiki to fail.
 newsrcdir();
 ok(! system("touch $srcdir/foo.mdwn"));