From ad5c79a489ea8176d58897dbc1444fa728c6d428 Mon Sep 17 00:00:00 2001
From: "Niall Douglas (s [underscore] sourceforge {at} nedprod [dot] com)"
 <spamtrap@nedprod.com>
Date: Fri, 3 Jul 2020 21:22:39 +0100
Subject: Fix bug in reduce() on POSIX which was causing random failure to
 reduce.

---
 test/tests/path_view.cpp      | 4 +++-
 test/tests/process_handle.cpp | 4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)

(limited to 'test')

diff --git a/test/tests/path_view.cpp b/test/tests/path_view.cpp
index 51dd6bc9..f8f40da2 100644
--- a/test/tests/path_view.cpp
+++ b/test/tests/path_view.cpp
@@ -189,10 +189,12 @@ static inline void TestPathView()
   // On Windows this is relative, on POSIX it is absolute
   BOOST_CHECK(llfio::path_view("/niall").is_relative());
 
-  // This was segfaulting on Appveyor
+// This fails on VS2017 for no obvious reason
+#if _MSC_VER >= 1920
   llfio::
   path_view_component longthing(LR"(Path=C:\Program Files\Docker\Docker\Resources\bin;C:\Program Files (x86)\Microsoft SDKs\Azure\CLI2\wbin;C:\Perl\site\bin;C:\Perl\bin;C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Windows\System32\WindowsPowerShell\v1.0\;C:\Program Files\7-Zip;C:\Tools\GitVersion;C:\Tools\NuGet;C:\Program Files\Microsoft\Web Platform Installer\;C:\Tools\PsTools;C:\Program Files\Git LFS;C:\Program Files\Mercurial\;C:\Program Files (x86)\Subversion\bin;C:\Tools\WebDriver;C:\Tools\Coverity\bin;C:\Tools\MSpec;C:\Tools\NUnit\bin;C:\Tools\NUnit3;C:\Tools\xUnit;C:\Program Files\nodejs;C:\Program Files (x86)\iojs;C:\Program Files\iojs;C:\Program Files\Microsoft SQL Server\120\Tools\Binn\;C:\Program Files\Microsoft SQL Server\Client SDK\ODBC\110\Tools\Binn\;C:\Program Files (x86)\Microsoft SQL Server\120\Tools\Binn\;C:\Program Files\Microsoft SQL Server\120\DTS\Binn\;C:\Program Files (x86)\Microsoft SQL Server\120\Tools\Binn\ManagementStudio\;C:\Program Files (x86)\Microsoft SQL Server\120\DTS\Binn\;C:\Program Files (x86)\Microsoft SQL Server\130\Tools\Binn\;C:\Program Files\Microsoft SQL Server\130\Tools\Binn\;C:\Program Files (x86)\Microsoft SQL Server\130\DTS\Binn\;C:\Program Files\Microsoft SQL Server\130\DTS\Binn\;C:\Program Files\Microsoft SQL Server\Client SDK\ODBC\130\Tools\Binn\;C:\Ruby193\bin;C:\go\bin;C:\Program Files\Java\jdk1.8.0\bin;C:\Program Files (x86)\Apache\Maven\bin;C:\Python27;C:\Python27\Scripts;C:\Program Files (x86)\CMake\bin;C:\Tools\curl\bin;C:\Program Files\Microsoft DNX\Dnvm\;C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\MSBuild\15.0\Bin;C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\Common7\IDE\Extensions\Microsoft\SQLDB\DAC\130;C:\Program Files\dotnet\;C:\Tools\vcpkg;C:\Program Files (x86)\dotnet\;C:\Program Files (x86)\Microsoft SQL Server\140\Tools\Binn\;C:\Program Files\Microsoft SQL Server\140\Tools\Binn\;C:\Program Files\Microsoft SQL Server\140\DTS\Binn\;C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\Common7\IDE\Extensions\TestPlatform;C:\Program Files (x86)\Microsoft SQL Server\110\DTS\Binn\;C:\Program Files (x86)\Microsoft SQL Server\140\DTS\Binn\;C:\Program Files\erl9.2\bin;C:\Program Files (x86)\NSIS;C:\Tools\Octopus;C:\Program Files\Microsoft Service Fabric\bin\Fabric\Fabric.Code;C:\Program Files\Microsoft SDKs\Service Fabric\Tools\ServiceFabricLocalClusterManager;C:\Program Files\Docker\Docker\resources;C:\Program Files\LLVM\bin;C:\Users\appveyor\AppData\Roaming\npm;C:\Program Files (x86)\Windows Kits\10\Windows Performance Toolkit\;C:\Program Files\PowerShell\6\;C:\Program Files (x86)\nodejs\;C:\Program Files\Git\cmd;C:\Program Files\Git\usr\bin;C:\Program Files\Meson\;C:\ProgramData\chocolatey\bin;C:\Program Files\Amazon\AWSCLI\;C:\Program Files (x86)\Yarn\bin\;C:\Users\appveyor\AppData\Local\Microsoft\WindowsApps;C:\Users\appveyor\.dotnet\tools;C:\Users\appveyor\AppData\Roaming\npm;C:\Users\appveyor\AppData\Local\Yarn\bin;C:\Program Files\AppVeyor\BuildAgent\)");
   std::cout << "A very long path component is " << longthing << std::endl;
+#endif
 #else
   BOOST_CHECK(llfio::path_view("/niall").is_absolute());
 #endif
diff --git a/test/tests/process_handle.cpp b/test/tests/process_handle.cpp
index 1ddf26e5..5aff5eb1 100644
--- a/test/tests/process_handle.cpp
+++ b/test/tests/process_handle.cpp
@@ -45,8 +45,8 @@ static inline void TestProcessHandle(bool with_redirection)
            if(sv.size() >= 512)
              return false;
            using _string_view = std::decay_t<decltype(sv)>;
-           _string_view a((const _string_view::value_type *) "JENKINS_NEDPROD_PASSWORD");
-           _string_view b((const _string_view::value_type *) L"JENKINS_NEDPROD_PASSWORD");
+           _string_view a((const typename _string_view::value_type *) "JENKINS_NEDPROD_PASSWORD");
+           _string_view b((const typename _string_view::value_type *) L"JENKINS_NEDPROD_PASSWORD");
            return (sv.npos == sv.find(a)) && (sv.npos == sv.find(b));
          }))
       {
-- 
cgit v1.2.3