diff options
-rw-r--r-- | distribution/boxbackup/THANKS.txt | 3 | ||||
-rw-r--r-- | test/bbackupd/testbbackupd.cpp | 14 |
2 files changed, 10 insertions, 7 deletions
diff --git a/distribution/boxbackup/THANKS.txt b/distribution/boxbackup/THANKS.txt index 92b5da08..09ad60e2 100644 --- a/distribution/boxbackup/THANKS.txt +++ b/distribution/boxbackup/THANKS.txt @@ -64,3 +64,6 @@ JŽr™me Schell John Pybus - Ideas and feature requests - Useful little patches to code + +Stefan Norlin + - Help with testing and fixes on lots of different Solaris platforms diff --git a/test/bbackupd/testbbackupd.cpp b/test/bbackupd/testbbackupd.cpp index 0e01619a..dcb9d44a 100644 --- a/test/bbackupd/testbbackupd.cpp +++ b/test/bbackupd/testbbackupd.cpp @@ -516,7 +516,7 @@ int test_bbackupd() // unpack the files for the initial test TEST_THAT(::system("rm -rf testfiles/TestDir1") == 0); TEST_THAT(::system("mkdir testfiles/TestDir1") == 0); - TEST_THAT(::system("tar xzf testfiles/spacetest1.tgz -C testfiles/TestDir1/") == 0); + TEST_THAT(::system("gzip -d < testfiles/spacetest1.tgz | tar xf - -C testfiles/TestDir1/") == 0); int pid = LaunchServer("../../bin/bbackupd/bbackupd testfiles/bbackupd.conf", "testfiles/bbackupd.pid"); TEST_THAT(pid != -1 && pid != 0); @@ -535,7 +535,7 @@ int test_bbackupd() TestRemoteProcessMemLeaks("bbstoreaccounts.memleaks"); // Unpack some more files - TEST_THAT(::system("tar xzf testfiles/spacetest2.tgz -C testfiles/TestDir1/") == 0); + TEST_THAT(::system("gzip -d < testfiles/spacetest2.tgz | tar xf - -C testfiles/TestDir1/") == 0); // Delete a file and a directory TEST_THAT(::unlink("testfiles/TestDir1/spacetest/d1/f3") == 0); TEST_THAT(::system("rm -rf testfiles/TestDir1/spacetest/d3/d4") == 0); @@ -556,7 +556,7 @@ int test_bbackupd() TEST_THAT(!TestFileExists("testfiles/notifyran.store-full.2")); // unpack the initial files again - TEST_THAT(::system("tar xzf testfiles/test_base.tgz -C testfiles/") == 0); + TEST_THAT(::system("gzip -d < testfiles/test_base.tgz | tar xf - -C testfiles/") == 0); // wait for it to do it's stuff wait_for_backup_operation(); @@ -656,7 +656,7 @@ int test_bbackupd() // Add some more files // Because the 'm' option is not used, these files will look very old to the daemon. // Lucky it'll upload them then! - TEST_THAT(::system("tar xzf testfiles/test2.tgz -C testfiles/") == 0); + TEST_THAT(::system("gzip -d < testfiles/test2.tgz | tar xf - -C testfiles/") == 0); ::chmod("testfiles/TestDir1/sub23/dhsfdss/blf.h", 0415); // Wait and test @@ -693,7 +693,7 @@ int test_bbackupd() // Add some files and directories which are marked as excluded printf("Add files and dirs for exclusion test\n"); - TEST_THAT(::system("tar xzf testfiles/testexclude.tgz -C testfiles/") == 0); + TEST_THAT(::system("gzip -d < testfiles/testexclude.tgz | tar xf - -C testfiles/") == 0); // Wait and test wait_for_backup_operation(); compareReturnValue = ::system("../../bin/bbackupquery/bbackupquery -q -c testfiles/bbackupd.conf -l testfiles/query3c.log \"compare -ac\" quit"); @@ -830,7 +830,7 @@ int test_bbackupd() // Add some more files and modify others // Use the m flag this time so they have a recent modification time - TEST_THAT(::system("tar xzmf testfiles/test3.tgz -C testfiles/") == 0); + TEST_THAT(::system("gzip -d < testfiles/test3.tgz | tar xmf - -C testfiles/") == 0); // Wait and test wait_for_backup_operation(); @@ -1035,7 +1035,7 @@ int test(int argc, const char *argv[]) BackupClientCryptoKeys_Setup("testfiles/bbackupd.keys"); // Initial files - TEST_THAT(::system("tar xzf testfiles/test_base.tgz -C testfiles/") == 0); + TEST_THAT(::system("gzip -d < testfiles/test_base.tgz | tar xf - -C testfiles/") == 0); // Do the tests |