diff options
| author | Chris Wilson <chris+github@qwirx.com> | 2014-08-17 10:59:16 +0000 |
|---|---|---|
| committer | Chris Wilson <chris+github@qwirx.com> | 2014-08-17 10:59:16 +0000 |
| commit | 6f05cd831394335c32c6eebc4f4da7454302bbc9 (patch) | |
| tree | 12b6fe06ef5a06d016d31da001c87882e702ef39 | |
| parent | 883f65709e74967de4e8f23b841cf8bda150c379 (diff) | |
Fix tests broken by bbackupquery list recursive option change.
| -rw-r--r-- | test/backupstorefix/testbackupstorefix.cpp | 2 | ||||
| -rwxr-xr-x | test/backupstorefix/testfiles/testbackupstorefix.pl.in | 4 | ||||
| -rw-r--r-- | test/bbackupd/testbbackupd.cpp | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/test/backupstorefix/testbackupstorefix.cpp b/test/backupstorefix/testbackupstorefix.cpp index 1dfdcd08..6ae78bc9 100644 --- a/test/backupstorefix/testbackupstorefix.cpp +++ b/test/backupstorefix/testbackupstorefix.cpp @@ -614,7 +614,7 @@ int test(int argc, const char *argv[]) // Generate a list of all the object IDs TEST_THAT_ABORTONFAIL(::system(BBACKUPQUERY " -Wwarning " - "-c testfiles/bbackupd.conf \"list -r\" quit " + "-c testfiles/bbackupd.conf \"list -R\" quit " "> testfiles/initial-listing.txt") == 0); // And load it in diff --git a/test/backupstorefix/testfiles/testbackupstorefix.pl.in b/test/backupstorefix/testfiles/testbackupstorefix.pl.in index 28dc439f..d724946e 100755 --- a/test/backupstorefix/testfiles/testbackupstorefix.pl.in +++ b/test/backupstorefix/testfiles/testbackupstorefix.pl.in @@ -95,7 +95,7 @@ elsif($ARGV[0] eq 'check') # read in the new listing, and compare open LISTING,"../../bin/bbackupquery/bbackupquery -Wwarning " . "-c testfiles/bbackupd.conf " . - "\"list -r\" quit |" + "\"list -R\" quit |" or die "Can't open list utility"; open LISTING_COPY,'>testfiles/listing'.$ARGV[1].'.txt' or die "can't open copy listing file"; @@ -131,7 +131,7 @@ elsif($ARGV[0] eq 'reroot') { open LISTING,"../../bin/bbackupquery/bbackupquery -Wwarning " . "-c testfiles/bbackupd.conf " . - "\"list -r\" quit |" + "\"list -R\" quit |" or die "Can't open list utility"; open LISTING_COPY,'>testfiles/listing'.$ARGV[1].'.txt' or die "can't open copy listing file"; diff --git a/test/bbackupd/testbbackupd.cpp b/test/bbackupd/testbbackupd.cpp index d09132cc..3927c74d 100644 --- a/test/bbackupd/testbbackupd.cpp +++ b/test/bbackupd/testbbackupd.cpp @@ -3934,7 +3934,7 @@ int test_bbackupd() /* // List the files on the server - why? ::system(BBACKUPQUERY " -q -c testfiles/bbackupd.conf " - "-l testfiles/queryLIST.log \"list -rotdh\" quit"); + "-l testfiles/queryLIST.log \"list -Rotdh\" quit"); TestRemoteProcessMemLeaks("bbackupquery.memleaks"); */ |