Photos
Blog
Projects
vanrenterghem.biz
projects
/
git.ikiwiki.info.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
respond to various things
[git.ikiwiki.info.git]
/
t
/
conflicts.t
diff --git
a/t/conflicts.t
b/t/conflicts.t
index d7e04d3ae39a66b1bdcd711aa0aa0ee12f0584ec..fae0e84c9afda1365b14106313640e8e9aa5f889 100755
(executable)
--- a/
t/conflicts.t
+++ b/
t/conflicts.t
@@
-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 {