From: Cristian Adam <cristian.adam@gmail.com>
Date: Sun, 15 Dec 2019 19:48:19 +0000 (+0100)
Subject: Unittest fixes on Windows (#496)
X-Git-Tag: v4.0~693
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bc897d216fccc2ed2aeb7f3123d7a763694fedfd;p=thirdparty%2Fccache.git

Unittest fixes on Windows (#496)
---

diff --git a/unittest/test_Config.cpp b/unittest/test_Config.cpp
index 2521421bd..ae251dc5b 100644
--- a/unittest/test_Config.cpp
+++ b/unittest/test_Config.cpp
@@ -363,7 +363,11 @@ TEST_CASE("Config::visit_items")
 {
   Util::write_file(
     "test.conf",
+#ifndef _WIN32
     "base_dir = /bd\n"
+#else
+    "base_dir = C:/bd\n"
+#endif
     "cache_dir = cd\n"
     "cache_dir_levels = 7\n"
     "compiler = c\n"
@@ -413,7 +417,11 @@ TEST_CASE("Config::visit_items")
   });
 
   std::vector<std::string> expected = {
+#ifndef _WIN32
     "(test.conf) base_dir = /bd",
+#else
+    "(test.conf) base_dir = C:/bd",
+#endif
     "(test.conf) cache_dir = cd",
     "(test.conf) cache_dir_levels = 7",
     "(test.conf) compiler = c",
diff --git a/unittest/test_ZstdCompression.cpp b/unittest/test_ZstdCompression.cpp
index b978b5f88..4eab5466f 100644
--- a/unittest/test_ZstdCompression.cpp
+++ b/unittest/test_ZstdCompression.cpp
@@ -27,14 +27,14 @@ using Catch::Equals;
 
 TEST_CASE("Small Compression::Type::zstd roundtrip")
 {
-  File f("data.zstd", "w");
+  File f("data.zstd", "wb");
   auto compressor =
     Compressor::create_from_type(Compression::Type::zstd, f.get(), 1);
   CHECK(compressor->actual_compression_level() == 1);
   compressor->write("foobar", 6);
   compressor->finalize();
 
-  f.open("data.zstd", "r");
+  f.open("data.zstd", "rb");
   auto decompressor =
     Decompressor::create_from_type(Compression::Type::zstd, f.get());
 
@@ -61,7 +61,7 @@ TEST_CASE("Large compressible Compression::Type::zstd roundtrip")
 {
   char data[] = "The quick brown fox jumps over the lazy dog";
 
-  File f("data.zstd", "w");
+  File f("data.zstd", "wb");
   auto compressor =
     Compressor::create_from_type(Compression::Type::zstd, f.get(), 1);
   for (size_t i = 0; i < 1000; i++) {
@@ -69,7 +69,7 @@ TEST_CASE("Large compressible Compression::Type::zstd roundtrip")
   }
   compressor->finalize();
 
-  f.open("data.zstd", "r");
+  f.open("data.zstd", "rb");
   auto decompressor =
     Decompressor::create_from_type(Compression::Type::zstd, f.get());
 
@@ -94,13 +94,13 @@ TEST_CASE("Large uncompressible Compression::Type::zstd roundtrip")
     data[i] = rand() % 256;
   }
 
-  File f("data.zstd", "w");
+  File f("data.zstd", "wb");
   auto compressor =
     Compressor::create_from_type(Compression::Type::zstd, f.get(), 1);
   compressor->write(data, sizeof(data));
   compressor->finalize();
 
-  f.open("data.zstd", "r");
+  f.open("data.zstd", "rb");
   auto decompressor =
     Decompressor::create_from_type(Compression::Type::zstd, f.get());