diff options
Diffstat (limited to 't/23_annex-to-annex-reinject.t')
-rwxr-xr-x | t/23_annex-to-annex-reinject.t | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/t/23_annex-to-annex-reinject.t b/t/23_annex-to-annex-reinject.t index 2e672ea..5791c81 100755 --- a/t/23_annex-to-annex-reinject.t +++ b/t/23_annex-to-annex-reinject.t @@ -5,23 +5,18 @@ use strict; use warnings; use lib 't/lib'; +use App::annex_to_annex; +use App::annex_to_annex_reinject; use Test::More; use File::Spec::Functions qw(rel2abs); use t::Setup; +use t::Util; use File::chdir; -# make sure that `make test` will always use the right version of the -# script we seek to test -my $a2a = "annex-to-annex"; -my $a2a_ri = "annex-to-annex-reinject"; -$a2a = rel2abs "blib/script/annex-to-annex" if -x "blib/script/annex-to-annex"; -$a2a_ri = rel2abs "blib/script/annex-to-annex-reinject" - if -x "blib/script/annex-to-annex-reinject"; - with_temp_annexes { my (undef, undef, $source2) = @_; - system $a2a, qw(--commit source1/foo source2/other dest); + run_bin qw(annex-to-annex --commit source1/foo source2/other dest); { local $CWD = "source2"; $source2->checkout("master~1"); @@ -29,7 +24,7 @@ with_temp_annexes { "other is initially present"; $source2->checkout("master"); } - system $a2a_ri, qw(source2 dest); + run_bin qw(annex-to-annex-reinject source2 dest); { local $CWD = "source2"; $source2->checkout("master~1"); |