summaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorintrigeri <intrigeri@boum.org>2009-04-20 12:21:18 +0200
committerintrigeri <intrigeri@boum.org>2009-04-20 12:21:18 +0200
commit4558457402a4ab6bc795589a2e400fa66144f76e (patch)
tree8368320617a8febc3c9c9708f688b6591801f4c0 /t
parent9db2438b3a0366738ba2e1b6e23ad3d8ae2fe36e (diff)
parent2cc3f5d057c5882e08d16746985c49a7dd1a4c01 (diff)
Merge commit 'upstream/master' into pub/po
Conflicts: debian/changelog debian/control
Diffstat (limited to 't')
-rwxr-xr-xt/git.t19
1 files changed, 8 insertions, 11 deletions
diff --git a/t/git.t b/t/git.t
index b3aa6a80b..f1c24b359 100755
--- a/t/git.t
+++ b/t/git.t
@@ -3,19 +3,17 @@ use warnings;
use strict;
my $dir;
-my $gitrepo;
BEGIN {
$dir="/tmp/ikiwiki-test-git.$$";
- $gitrepo="$dir/repo";
my $git=`which git`;
chomp $git;
- if (! -x $git || ! mkdir($dir) || ! mkdir($gitrepo)) {
+ if (! -x $git || ! mkdir($dir)) {
eval q{
- use Test::More skip_all => "git not available or could not make test dirs"
+ use Test::More skip_all => "git not available or could not make test dir"
}
}
}
-use Test::More tests => 16;
+use Test::More tests => 18;
BEGIN { use_ok("IkiWiki"); }
@@ -25,17 +23,16 @@ $config{srcdir} = "$dir/src";
IkiWiki::loadplugins();
IkiWiki::checkconfig();
-system "cd $gitrepo && git init >/dev/null 2>&1";
-system "cd $gitrepo && echo dummy > dummy; git add . >/dev/null 2>&1";
-system "cd $gitrepo && git commit -m Initial >/dev/null 2>&1";
-system "git clone -l -s $gitrepo $config{srcdir} >/dev/null 2>&1";
+ok (mkdir($config{srcdir}));
+is (system("./ikiwiki-makerepo git $config{srcdir} $dir/repo"), 0);
my @changes;
@changes = IkiWiki::rcs_recentchanges(3);
is($#changes, 0); # counts for dummy commit during repo creation
-is($changes[0]{message}[0]{"line"}, "Initial");
-is($changes[0]{pages}[0]{"page"}, "dummy");
+# ikiwiki-makerepo's first commit is setting up the .gitignore
+is($changes[0]{message}[0]{"line"}, "initial commit");
+is($changes[0]{pages}[0]{"page"}, ".gitignore");
# Web commit
my $test1 = readfile("t/test1.mdwn");