test/bbackupd: convert some tests to specialised (to run on S3 too)

boxbackup · Oct 30, 2018 · 821baee · 821baee
1 parent 45a121e
commit 821baee
Show file tree

Hide file tree

Showing 10 changed files with 413 additions and 163 deletions.
diff --git a/.gitignore b/.gitignore
@@ -32,7 +32,7 @@ lib/server/makeprotocol.pl
 runtest.pl
 test/backupstorefix/testfiles/testbackupstorefix.pl
 test/bbackupd/testfiles/bbackupd.conf
-test/bbackupd/testfiles/bbackupd-exclude.conf
+test/bbackupd/testfiles/bbackupd.s3.conf
 test/bbackupd/testfiles/bbackupd-snapshot.conf
 test/bbackupd/testfiles/bbackupd-symlink.conf
 test/bbackupd/testfiles/bbackupd-temploc.conf

diff --git a/configure.ac b/configure.ac
@@ -89,7 +89,7 @@ AC_CONFIG_FILES([infrastructure/BoxPlatform.pm
                  contrib/solaris/bbstored-manifest.xml
                  lib/common/BoxPortsAndFiles.h
                  test/bbackupd/testfiles/bbackupd.conf
-                 test/bbackupd/testfiles/bbackupd-exclude.conf
+                 test/bbackupd/testfiles/bbackupd.s3.conf
                  test/bbackupd/testfiles/bbackupd-snapshot.conf
                  test/bbackupd/testfiles/bbackupd-symlink.conf
                  test/bbackupd/testfiles/bbackupd-temploc.conf

diff --git a/infrastructure/cmake/CMakeLists.txt b/infrastructure/cmake/CMakeLists.txt
@@ -41,7 +41,7 @@ set(files_to_configure
 	runtest.pl
 	test/backupstorefix/testfiles/testbackupstorefix.pl
 	test/bbackupd/testfiles/bbackupd.conf
-	test/bbackupd/testfiles/bbackupd-exclude.conf
+	test/bbackupd/testfiles/bbackupd.s3.conf
 	test/bbackupd/testfiles/bbackupd-snapshot.conf
 	test/bbackupd/testfiles/bbackupd-symlink.conf
 	test/bbackupd/testfiles/bbackupd-temploc.conf

diff --git a/runtest.pl.in b/runtest.pl.in
@@ -200,6 +200,14 @@ sub runtest
 			foreach my $line (<EXTRA>)
 			{
 				chomp $line;
+
+				# Remove comments and skip blank lines:
+				$line =~ s/#.*//;
+				if (not $line)
+				{
+					continue;
+				}
+
 				if ($line =~ m/^mkdir (.*)/)
 				{
 					push @commands, "cmake -E make_directory $test_dst_dir/$1";

diff --git a/test/backupstorefix/testextra b/test/backupstorefix/testextra
@@ -3,3 +3,5 @@ mkdir testfiles/0_1
 mkdir testfiles/0_2
 mkdir testfiles/bbackupd-data
 cp ../../../test/bbackupd/testfiles/*.* testfiles/
+# Overwrite bbackupd.s3.conf from test/bbackupd with our own (different MinimumFileAge):
+cp ../../../test/backupstorefix/testfiles/bbackupd.s3.conf testfiles/