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
Merge branch 'master' into debian-jessie-backports
[git.ikiwiki.info.git]
/
t
/
conflicts.t
diff --git
a/t/conflicts.t
b/t/conflicts.t
index 07c392cd3a70ae59992f422124814cd21fdd5b32..2c2761efb9e129d68fcfe0547ec34b3e89ca896d 100755
(executable)
--- a/
t/conflicts.t
+++ b/
t/conflicts.t
@@
-2,6
+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 Cwd qw(getcwd);
use Test::More tests => 106;
my $installed = $ENV{INSTALLED_TESTS};
use Test::More tests => 106;
my $installed = $ENV{INSTALLED_TESTS};
@@
-13,10
+14,10
@@
if ($installed) {
}
else {
ok(! system("make -s ikiwiki.out"));
}
else {
ok(! system("make -s ikiwiki.out"));
- @command =
qw(perl -I.
./ikiwiki.out
+ @command =
("perl", "-I".getcwd, qw(
./ikiwiki.out
--underlaydir=underlays/basewiki
--set underlaydirbase=underlays
--underlaydir=underlays/basewiki
--set underlaydirbase=underlays
- --templatedir=templates);
+ --templatedir=templates)
)
;
}
# setup
}
# setup