Another attempt to fix NMake release builds

appveyor.yml

@@ -28,7 +28,7 @@ environment:
     - build_tool: nmake
 
 cache:
-  - '%CMAKE_UNIBUILD_DIR%\cache -> infrastructure\cmake\windows\CMakeLists.txt'
+  - '%CMAKE_UNIBUILD_DIR%\cache -> appveyor.yml, infrastructure\cmake\windows\CMakeLists.txt'
 
 init:
 # Uncomment the following two lines to enable RDP access to the virtual machine for debugging.
@@ -97,13 +97,13 @@ before_build:
   - echo cmake -G "%generator_name%" %cmake_toolset_args% %cmake_toolset_args_2%
     %generator_args%
     -DBOXBACKUP_VERSION=%compiled_version%
-    -DSUB_CMAKE_EXTRA_ARGS="-- /verbosity:minimal"
+    -DSUB_CMAKE_EXTRA_ARGS="-DCMAKE_BUILD_TYPE:STRING=%CONFIGURATION% -- /verbosity:minimal"
     -DPLATFORM=%sane_platform%
     %APPVEYOR_BUILD_FOLDER%\infrastructure\cmake\windows
   - cmake -G "%generator_name%" %cmake_toolset_args% %cmake_toolset_args_2%
     %generator_args%
     -DBOXBACKUP_VERSION=%compiled_version%
-    -DSUB_CMAKE_EXTRA_ARGS="-- /verbosity:minimal"
+    -DSUB_CMAKE_EXTRA_ARGS="-DCMAKE_BUILD_TYPE:STRING=%CONFIGURATION% -- /verbosity:minimal"
     -DPLATFORM=%sane_platform%
     %APPVEYOR_BUILD_FOLDER%\infrastructure\cmake\windows
 
@@ -127,7 +127,7 @@ for:
 
   install:
   - ps: $env:generator_name="NMake Makefiles"
-  - ps: $env:generator_args="-DCMAKE_BUILD_TYPE=$env:CONFIGURATION"
+  - ps: $env:generator_args="-DCMAKE_BUILD_TYPE:STRING=$env:CONFIGURATION"
 
   build_script:
   - cmd: nmake

test/bbackupd/testfiles/bbackupd.s3.conf

@@ -0,0 +1,69 @@
+KeysFile = testfiles/bbackupd.keys
+
+DataDirectory = testfiles/bbackupd-data
+
+StorageBackend = s3
+
+S3Store
+{
+	HostName = localhost
+	S3VirtualHostName = testing.s3.amazonaws.com
+
+	# The S3Simulator requires us to send the correct endpoint (via the Host header) to
+	# distinguish between S3 and SimpleDB requests, so we cannot leave it at the default,
+	# empty value. It must be set to exactly this value for SimpleDB requests:
+	SimpleDBEndpoint = sdb.localhost
+	SimpleDBHostName = localhost
+	SimpleDBPort = 22080
+
+	Port = 22080
+	BasePath = /subdir/
+	AccessKey = 0PN5J17HBGZHT7JJ3X82
+	SecretKey = uV3F3YluFJax1cknvbcGwgjvx4QpvB+leU8dUj2o
+	CacheDirectory = testfiles/bbackupd-cache
+}
+
+UpdateStoreInterval = 3
+BackupErrorDelay = 10
+MinimumFileAge = 4
+MaxUploadWait = 7
+DeleteRedundantLocationsAfter = 10
+
+FileTrackingSizeThreshold = 1024
+DiffingUploadSizeThreshold = 1024
+
+MaximumDiffingTime = 3
+KeepAliveTime = 1
+
+ExtendedLogging = no
+ExtendedLogFile = testfiles/bbackupd.log
+# LogAllFileAccess = yes
+
+CommandSocket = testfiles/bbackupd.sock
+
+NotifyScript    = /usr/bin/perl testfiles/notifyscript.pl
+SyncAllowScript = /usr/bin/perl testfiles/syncallowscript.pl
+
+Server
+{
+	PidFile = testfiles/bbackupd.pid
+}
+
+BackupLocations
+{
+	Test1
+	{
+		Path = testfiles/TestDir1
+
+		ExcludeFile = testfiles/TestDir1/excluded_1
+		ExcludeFile = testfiles/TestDir1/excluded_2
+		ExcludeFilesRegex = \.excludethis$
+		ExcludeFilesRegex = EXCLUDE
+		AlwaysIncludeFile = testfiles/TestDir1/dont.excludethis
+		ExcludeDir = testfiles/TestDir1/exclude_dir
+		ExcludeDir = testfiles/TestDir1/exclude_dir_2
+		ExcludeDirsRegex = not_this_dir
+		AlwaysIncludeDirsRegex = ALWAYSINCLUDE
+	}
+}
+

test/bbackupd/testfiles/s3simulator.conf

@@ -0,0 +1,10 @@
+AccessKey = 0PN5J17HBGZHT7JJ3X82
+SecretKey = uV3F3YluFJax1cknvbcGwgjvx4QpvB+leU8dUj2o
+StoreDirectory = testfiles/store
+AddressPrefix = http://localhost:22080
+
+Server
+{
+	PidFile = testfiles/s3simulator.pid
+	ListenAddresses = inet:localhost:22080
+}