From 78e9dac99b12ae057060aa507ad9e523f2687ae4 Mon Sep 17 00:00:00 2001 From: Chris Wilson Date: Sat, 26 Dec 2015 23:40:20 +0000 Subject: Replace Unix-specific paths used by test/bbackupd with native paths. Should fix some problems with running the perl scripts, causing test failures on Windows. --- test/bbackupd/testfiles/extcheck1.pl.in | 5 ++++- test/bbackupd/testfiles/extcheck2.pl.in | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) (limited to 'test') diff --git a/test/bbackupd/testfiles/extcheck1.pl.in b/test/bbackupd/testfiles/extcheck1.pl.in index 5b70c677..c80ddc66 100755 --- a/test/bbackupd/testfiles/extcheck1.pl.in +++ b/test/bbackupd/testfiles/extcheck1.pl.in @@ -1,9 +1,12 @@ #!@PERL@ use strict; +use File::Spec; + my $flags = $ARGV[0] or ""; +my $bbackupquery = File::Spec->catfile('..', '..', 'bin', 'bbackupquery', 'bbackupquery'); -unless(open IN,"../../bin/bbackupquery/bbackupquery -Wwarning " . +unless(open IN, "$bbackupquery -Wwarning " . "-c testfiles/bbackupd.conf " . "-l testfiles/query4.log " . "\"compare -ac$flags\" quit 2>&1 |") diff --git a/test/bbackupd/testfiles/extcheck2.pl.in b/test/bbackupd/testfiles/extcheck2.pl.in index 3671ad93..02c258f8 100755 --- a/test/bbackupd/testfiles/extcheck2.pl.in +++ b/test/bbackupd/testfiles/extcheck2.pl.in @@ -1,9 +1,12 @@ #!@PERL@ use strict; +use File::Spec; + my $flags = $ARGV[0] or ""; +my $bbackupquery = File::Spec->catfile('..', '..', 'bin', 'bbackupquery', 'bbackupquery'); -unless(open IN,"../../bin/bbackupquery/bbackupquery -Wwarning " . +unless(open IN, "$bbackupquery -Wwarning " . "-c testfiles/bbackupd.conf " . "-l testfiles/query4.log " . "\"compare -ac$flags\" quit 2>&1 |") -- cgit v1.2.3