diff options
| author | Lorry Tar Creator <lorry-tar-importer@baserock.org> | 2015-04-08 03:09:47 +0000 |
|---|---|---|
| committer | <> | 2015-05-05 14:37:32 +0000 |
| commit | f2541bb90af059680aa7036f315f052175999355 (patch) | |
| tree | a5b214744b256f07e1dc2bd7273035a7808c659f /libs/filesystem/test | |
| parent | ed232fdd34968697a68783b3195b1da4226915b5 (diff) | |
| download | boost-tarball-master.tar.gz | |
Imported from /home/lorry/working-area/delta_boost-tarball/boost_1_58_0.tar.bz2.HEADboost_1_58_0master
Diffstat (limited to 'libs/filesystem/test')
44 files changed, 686 insertions, 352 deletions
diff --git a/libs/filesystem/test/issues/10205.cpp b/libs/filesystem/test/issues/10205.cpp new file mode 100644 index 000000000..4cf5e728d --- /dev/null +++ b/libs/filesystem/test/issues/10205.cpp @@ -0,0 +1,17 @@ +// Linux test; before running: export LANG=foo + +#include <locale> +#include <iostream> +#include <string> +#include <boost/filesystem/path.hpp> + +int main() +{ + std::string pathname = "/some/filesystem/path/%%%%"; + + boost::filesystem::path path(pathname); + + std::wcout << path.wstring() << std::endl; + + return 0; +} diff --git a/libs/filesystem/test/issues/3332/test.cpp b/libs/filesystem/test/issues/3332/test.cpp new file mode 100644 index 000000000..9456a7a83 --- /dev/null +++ b/libs/filesystem/test/issues/3332/test.cpp @@ -0,0 +1,37 @@ +#include <boost/filesystem.hpp> +#include <cvt/cp950> +#include <iostream> +#include <string> +#include <locale> + +namespace fs = boost::filesystem; + +int main(void) { + + std::locale global_loc = std::locale(); + std::locale loc(global_loc, new stdext::cvt::codecvt_cp950<wchar_t>); + fs::path::imbue(loc); + + std::cout << + "HEADS UP! PIPE OUTPUT TO FILE AND INSPECT WITH HEX OR CP950 EDITOR.\n" + "WINDOWS COMMAND PROMPT FONTS DON'T SUPPORT CHINESE,\n" + "EVEN WITH CODEPAGE SET AND EVEN AS OF WIN 10 TECH PREVIEW." << std::endl; + + fs::recursive_directory_iterator end; + fs::recursive_directory_iterator iter + ("C:/boost/test-files/utf-8"); + + while (iter != end) + { + if (fs::is_directory(*iter)) + { + std::cout << "[directory] " << iter->path().generic_string() << std::endl; + } + else if (fs::is_regular(*iter)) + { + std::cout << " [file] " << iter->path().generic_string() << std::endl; + } + ++iter; + } + return 0; +} diff --git a/libs/filesystem/test/issues/4329.-basename.cpp b/libs/filesystem/test/issues/4329.-basename.cpp new file mode 100644 index 000000000..a07648b32 --- /dev/null +++ b/libs/filesystem/test/issues/4329.-basename.cpp @@ -0,0 +1,20 @@ +#include <iostream> +#include <boost/filesystem.hpp> +using boost::filesystem::path; + +int main() +{ + std::cout << path("a").stem() << std::endl; + std::cout << path("a/").stem() << std::endl; + std::cout << path("a/b").stem() << std::endl; + std::cout << path("a/b/").stem() << std::endl; + std::cout << path("a/b/c").stem() << std::endl; + std::cout << path("a/b/c/").stem() << std::endl; + std::cout << path("a/b/c/d").stem() << std::endl; + std::cout << path("a/b/c/d/").stem() << std::endl; + std::cout << path("a/b/c/d/e").stem() << std::endl; + std::cout << path("a/b/c/d/e/").stem() << std::endl; + return 0; +} + + diff --git a/libs/filesystem/test/issues/5300-temp-dir-path-130.cpp b/libs/filesystem/test/issues/5300-temp-dir-path-130.cpp new file mode 100644 index 000000000..e69de29bb --- /dev/null +++ b/libs/filesystem/test/issues/5300-temp-dir-path-130.cpp diff --git a/libs/filesystem/test/issues/boost-no-inspect b/libs/filesystem/test/issues/boost-no-inspect new file mode 100644 index 000000000..e69de29bb --- /dev/null +++ b/libs/filesystem/test/issues/boost-no-inspect diff --git a/libs/filesystem/test/msvc/boost-no-inspect b/libs/filesystem/test/msvc/boost-no-inspect new file mode 100644 index 000000000..e69de29bb --- /dev/null +++ b/libs/filesystem/test/msvc/boost-no-inspect diff --git a/libs/filesystem/test/msvc/convenience_test/convenience_test.vcxproj b/libs/filesystem/test/msvc/convenience_test/convenience_test.vcxproj index c9ab76b35..14dfa1757 100644 --- a/libs/filesystem/test/msvc/convenience_test/convenience_test.vcxproj +++ b/libs/filesystem/test/msvc/convenience_test/convenience_test.vcxproj @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> +<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|Win32"> <Configuration>Debug</Configuration> @@ -20,12 +20,12 @@ <ConfigurationType>Application</ConfigurationType> <CharacterSet>Unicode</CharacterSet> <WholeProgramOptimization>true</WholeProgramOptimization> - <PlatformToolset>v120</PlatformToolset> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> <CharacterSet>Unicode</CharacterSet> - <PlatformToolset>v120</PlatformToolset> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <ImportGroup Label="ExtensionSettings"> diff --git a/libs/filesystem/test/msvc/deprecated_test/deprecated_test.vcxproj b/libs/filesystem/test/msvc/deprecated_test/deprecated_test.vcxproj index 943502c5c..1c5f1b3f6 100644 --- a/libs/filesystem/test/msvc/deprecated_test/deprecated_test.vcxproj +++ b/libs/filesystem/test/msvc/deprecated_test/deprecated_test.vcxproj @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> +<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|Win32"> <Configuration>Debug</Configuration> @@ -20,12 +20,12 @@ <ConfigurationType>Application</ConfigurationType> <CharacterSet>Unicode</CharacterSet> <WholeProgramOptimization>true</WholeProgramOptimization> - <PlatformToolset>v120</PlatformToolset> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> <CharacterSet>Unicode</CharacterSet> - <PlatformToolset>v120</PlatformToolset> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <ImportGroup Label="ExtensionSettings"> diff --git a/libs/filesystem/test/msvc/file_status/file_status.vcxproj b/libs/filesystem/test/msvc/file_status/file_status.vcxproj index 91721bade..1a746ce8d 100644 --- a/libs/filesystem/test/msvc/file_status/file_status.vcxproj +++ b/libs/filesystem/test/msvc/file_status/file_status.vcxproj @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> +<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|Win32"> <Configuration>Debug</Configuration> @@ -20,14 +20,14 @@ <ConfigurationType>Application</ConfigurationType> <UseDebugLibraries>true</UseDebugLibraries> <CharacterSet>Unicode</CharacterSet> - <PlatformToolset>v120</PlatformToolset> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> <UseDebugLibraries>false</UseDebugLibraries> <WholeProgramOptimization>true</WholeProgramOptimization> <CharacterSet>Unicode</CharacterSet> - <PlatformToolset>v120</PlatformToolset> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <ImportGroup Label="ExtensionSettings"> diff --git a/libs/filesystem/test/msvc/filesystem.sln b/libs/filesystem/test/msvc/filesystem.sln index 4be2cfa01..f72b6225e 100644 --- a/libs/filesystem/test/msvc/filesystem.sln +++ b/libs/filesystem/test/msvc/filesystem.sln @@ -1,7 +1,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Express 2013 for Windows Desktop -VisualStudioVersion = 12.0.30626.0 +# Visual Studio 14 +VisualStudioVersion = 14.0.22310.1 MinimumVisualStudioVersion = 10.0.40219.1 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "path_unit_test", "path_unit_test\path_unit_test.vcxproj", "{3C77F610-2E31-4087-9DF2-7CD45198A02D}" EndProject @@ -106,6 +106,12 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "odr_test", "odr_test\odr_te EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hello_filesystem", "hello_filesystem\hello_filesystem.vcxproj", "{3D74D9C5-31B1-4D5B-B49C-8725E26CF768}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "issue_test", "issue_test\issue_test.vcxproj", "{3B1AF12C-25AB-44F7-A80B-8BBA0D3D08CE}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "headers", "headers\headers.vcxproj", "{5FFA4555-E967-4632-A3E6-ED8826E9FDED}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bug-reporting", "bug-reporting\bug-reporting.vcxproj", "{534B6F8A-B899-4C68-A10C-BB98FFCB35D6}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 @@ -232,6 +238,16 @@ Global {3D74D9C5-31B1-4D5B-B49C-8725E26CF768}.Debug|Win32.Build.0 = Debug|Win32 {3D74D9C5-31B1-4D5B-B49C-8725E26CF768}.Release|Win32.ActiveCfg = Release|Win32 {3D74D9C5-31B1-4D5B-B49C-8725E26CF768}.Release|Win32.Build.0 = Release|Win32 + {3B1AF12C-25AB-44F7-A80B-8BBA0D3D08CE}.Debug|Win32.ActiveCfg = Debug|Win32 + {3B1AF12C-25AB-44F7-A80B-8BBA0D3D08CE}.Debug|Win32.Build.0 = Debug|Win32 + {3B1AF12C-25AB-44F7-A80B-8BBA0D3D08CE}.Release|Win32.ActiveCfg = Release|Win32 + {3B1AF12C-25AB-44F7-A80B-8BBA0D3D08CE}.Release|Win32.Build.0 = Release|Win32 + {5FFA4555-E967-4632-A3E6-ED8826E9FDED}.Debug|Win32.ActiveCfg = Debug|Win32 + {5FFA4555-E967-4632-A3E6-ED8826E9FDED}.Release|Win32.ActiveCfg = Release|Win32 + {534B6F8A-B899-4C68-A10C-BB98FFCB35D6}.Debug|Win32.ActiveCfg = Debug|Win32 + {534B6F8A-B899-4C68-A10C-BB98FFCB35D6}.Debug|Win32.Build.0 = Debug|Win32 + {534B6F8A-B899-4C68-A10C-BB98FFCB35D6}.Release|Win32.ActiveCfg = Release|Win32 + {534B6F8A-B899-4C68-A10C-BB98FFCB35D6}.Release|Win32.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/libs/filesystem/test/msvc/filesystem_dll/filesystem_dll.vcxproj b/libs/filesystem/test/msvc/filesystem_dll/filesystem_dll.vcxproj index 98ac7817d..aa19a6e8c 100644 --- a/libs/filesystem/test/msvc/filesystem_dll/filesystem_dll.vcxproj +++ b/libs/filesystem/test/msvc/filesystem_dll/filesystem_dll.vcxproj @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> +<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|Win32"> <Configuration>Debug</Configuration> @@ -20,12 +20,12 @@ <ConfigurationType>DynamicLibrary</ConfigurationType> <CharacterSet>Unicode</CharacterSet> <WholeProgramOptimization>true</WholeProgramOptimization> - <PlatformToolset>v120</PlatformToolset> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> <ConfigurationType>DynamicLibrary</ConfigurationType> <CharacterSet>Unicode</CharacterSet> - <PlatformToolset>v120</PlatformToolset> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <ImportGroup Label="ExtensionSettings"> @@ -50,7 +50,7 @@ <ClCompile> <Optimization>Disabled</Optimization> <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;FILESYSTEM_DLL_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>BOOST_FILEYSTEM_INCLUDE_IOSTREAM;WIN32;_DEBUG;_WINDOWS;_USRDLL;FILESYSTEM_DLL_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> <MinimalRebuild>true</MinimalRebuild> <ExceptionHandling>Async</ExceptionHandling> <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> diff --git a/libs/filesystem/test/msvc/filesystem_lib/filesystem_lib.vcxproj b/libs/filesystem/test/msvc/filesystem_lib/filesystem_lib.vcxproj index 29eac94df..3aecd33da 100644 --- a/libs/filesystem/test/msvc/filesystem_lib/filesystem_lib.vcxproj +++ b/libs/filesystem/test/msvc/filesystem_lib/filesystem_lib.vcxproj @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> +<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|Win32"> <Configuration>Debug</Configuration> @@ -35,14 +35,14 @@ <ConfigurationType>StaticLibrary</ConfigurationType> <UseDebugLibraries>true</UseDebugLibraries> <CharacterSet>Unicode</CharacterSet> - <PlatformToolset>v120</PlatformToolset> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> <ConfigurationType>StaticLibrary</ConfigurationType> <UseDebugLibraries>false</UseDebugLibraries> <WholeProgramOptimization>true</WholeProgramOptimization> <CharacterSet>Unicode</CharacterSet> - <PlatformToolset>v120</PlatformToolset> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <ImportGroup Label="ExtensionSettings"> diff --git a/libs/filesystem/test/msvc/fstream_test/fstream_test.vcxproj b/libs/filesystem/test/msvc/fstream_test/fstream_test.vcxproj index fbd26f28c..dba20e5fd 100644 --- a/libs/filesystem/test/msvc/fstream_test/fstream_test.vcxproj +++ b/libs/filesystem/test/msvc/fstream_test/fstream_test.vcxproj @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> +<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|Win32"> <Configuration>Debug</Configuration> @@ -20,12 +20,12 @@ <ConfigurationType>Application</ConfigurationType> <CharacterSet>Unicode</CharacterSet> <WholeProgramOptimization>true</WholeProgramOptimization> - <PlatformToolset>v120</PlatformToolset> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> <CharacterSet>Unicode</CharacterSet> - <PlatformToolset>v120</PlatformToolset> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <ImportGroup Label="ExtensionSettings"> diff --git a/libs/filesystem/test/msvc/headers/headers.vcxproj b/libs/filesystem/test/msvc/headers/headers.vcxproj new file mode 100644 index 000000000..952e0c4fa --- /dev/null +++ b/libs/filesystem/test/msvc/headers/headers.vcxproj @@ -0,0 +1,94 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ItemGroup Label="ProjectConfigurations"> + <ProjectConfiguration Include="Debug|Win32"> + <Configuration>Debug</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release|Win32"> + <Configuration>Release</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + </ItemGroup> + <PropertyGroup Label="Globals"> + <ProjectGuid>{5FFA4555-E967-4632-A3E6-ED8826E9FDED}</ProjectGuid> + <Keyword>Win32Proj</Keyword> + <RootNamespace>headers</RootNamespace> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <UseDebugLibraries>true</UseDebugLibraries> + <PlatformToolset>v140</PlatformToolset> + <CharacterSet>Unicode</CharacterSet> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <UseDebugLibraries>false</UseDebugLibraries> + <PlatformToolset>v140</PlatformToolset> + <WholeProgramOptimization>true</WholeProgramOptimization> + <CharacterSet>Unicode</CharacterSet> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> + <ImportGroup Label="ExtensionSettings"> + </ImportGroup> + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <PropertyGroup Label="UserMacros" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <LinkIncremental>true</LinkIncremental> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <LinkIncremental>false</LinkIncremental> + </PropertyGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <ClCompile> + <PrecompiledHeader> + </PrecompiledHeader> + <WarningLevel>Level3</WarningLevel> + <Optimization>Disabled</Optimization> + <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <SDLCheck>true</SDLCheck> + </ClCompile> + <Link> + <SubSystem>Console</SubSystem> + <GenerateDebugInformation>true</GenerateDebugInformation> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <ClCompile> + <WarningLevel>Level3</WarningLevel> + <PrecompiledHeader> + </PrecompiledHeader> + <Optimization>MaxSpeed</Optimization> + <FunctionLevelLinking>true</FunctionLevelLinking> + <IntrinsicFunctions>true</IntrinsicFunctions> + <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <SDLCheck>true</SDLCheck> + </ClCompile> + <Link> + <SubSystem>Console</SubSystem> + <GenerateDebugInformation>true</GenerateDebugInformation> + <EnableCOMDATFolding>true</EnableCOMDATFolding> + <OptimizeReferences>true</OptimizeReferences> + </Link> + </ItemDefinitionGroup> + <ItemGroup> + <ClInclude Include="..\..\..\include\boost\filesystem.hpp" /> + <ClInclude Include="..\..\..\include\boost\filesystem\config.hpp" /> + <ClInclude Include="..\..\..\include\boost\filesystem\convenience.hpp" /> + <ClInclude Include="..\..\..\include\boost\filesystem\detail\utf8_codecvt_facet.hpp" /> + <ClInclude Include="..\..\..\include\boost\filesystem\exception.hpp" /> + <ClInclude Include="..\..\..\include\boost\filesystem\fstream.hpp" /> + <ClInclude Include="..\..\..\include\boost\filesystem\operations.hpp" /> + <ClInclude Include="..\..\..\include\boost\filesystem\path.hpp" /> + <ClInclude Include="..\..\..\include\boost\filesystem\path_traits.hpp" /> + </ItemGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> + <ImportGroup Label="ExtensionTargets"> + </ImportGroup> +</Project>
\ No newline at end of file diff --git a/libs/filesystem/test/msvc/hello_filesystem/hello_filesystem.vcxproj b/libs/filesystem/test/msvc/hello_filesystem/hello_filesystem.vcxproj index 5a9cc9530..7c42df847 100644 --- a/libs/filesystem/test/msvc/hello_filesystem/hello_filesystem.vcxproj +++ b/libs/filesystem/test/msvc/hello_filesystem/hello_filesystem.vcxproj @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> +<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|Win32"> <Configuration>Debug</Configuration> @@ -19,13 +19,13 @@ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> <UseDebugLibraries>true</UseDebugLibraries> - <PlatformToolset>v120</PlatformToolset> + <PlatformToolset>v140</PlatformToolset> <CharacterSet>Unicode</CharacterSet> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> <UseDebugLibraries>false</UseDebugLibraries> - <PlatformToolset>v120</PlatformToolset> + <PlatformToolset>v140</PlatformToolset> <WholeProgramOptimization>true</WholeProgramOptimization> <CharacterSet>Unicode</CharacterSet> </PropertyGroup> diff --git a/libs/filesystem/test/msvc/issue_test/issue_test.vcxproj b/libs/filesystem/test/msvc/issue_test/issue_test.vcxproj new file mode 100644 index 000000000..8cb90de86 --- /dev/null +++ b/libs/filesystem/test/msvc/issue_test/issue_test.vcxproj @@ -0,0 +1,102 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ItemGroup Label="ProjectConfigurations"> + <ProjectConfiguration Include="Debug|Win32"> + <Configuration>Debug</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release|Win32"> + <Configuration>Release</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + </ItemGroup> + <PropertyGroup Label="Globals"> + <ProjectGuid>{3B1AF12C-25AB-44F7-A80B-8BBA0D3D08CE}</ProjectGuid> + <Keyword>Win32Proj</Keyword> + <RootNamespace>issue_test</RootNamespace> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <UseDebugLibraries>true</UseDebugLibraries> + <PlatformToolset>v140</PlatformToolset> + <CharacterSet>Unicode</CharacterSet> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <UseDebugLibraries>false</UseDebugLibraries> + <PlatformToolset>v140</PlatformToolset> + <WholeProgramOptimization>true</WholeProgramOptimization> + <CharacterSet>Unicode</CharacterSet> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> + <ImportGroup Label="ExtensionSettings"> + </ImportGroup> + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + <Import Project="..\common.props" /> + </ImportGroup> + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + <Import Project="..\common.props" /> + </ImportGroup> + <PropertyGroup Label="UserMacros" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <LinkIncremental>true</LinkIncremental> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <LinkIncremental>false</LinkIncremental> + </PropertyGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <ClCompile> + <PrecompiledHeader> + </PrecompiledHeader> + <WarningLevel>Level3</WarningLevel> + <Optimization>Disabled</Optimization> + <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <SDLCheck>true</SDLCheck> + </ClCompile> + <Link> + <SubSystem>Console</SubSystem> + <GenerateDebugInformation>true</GenerateDebugInformation> + </Link> + <PostBuildEvent> + <Command>"$(TargetDir)\$(TargetName).exe"</Command> + </PostBuildEvent> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <ClCompile> + <WarningLevel>Level3</WarningLevel> + <PrecompiledHeader> + </PrecompiledHeader> + <Optimization>MaxSpeed</Optimization> + <FunctionLevelLinking>true</FunctionLevelLinking> + <IntrinsicFunctions>true</IntrinsicFunctions> + <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <SDLCheck>true</SDLCheck> + </ClCompile> + <Link> + <SubSystem>Console</SubSystem> + <GenerateDebugInformation>true</GenerateDebugInformation> + <EnableCOMDATFolding>true</EnableCOMDATFolding> + <OptimizeReferences>true</OptimizeReferences> + </Link> + <PostBuildEvent> + <Command>"$(TargetDir)\$(TargetName).exe"</Command> + </PostBuildEvent> + </ItemDefinitionGroup> + <ItemGroup> + <ProjectReference Include="..\filesystem_dll\filesystem_dll.vcxproj"> + <Project>{ffd738f7-96f0-445c-81ea-551665ef53d1}</Project> + </ProjectReference> + <ProjectReference Include="..\system_dll\system_dll.vcxproj"> + <Project>{f94ccadd-a90b-480c-a304-c19d015d36b1}</Project> + </ProjectReference> + </ItemGroup> + <ItemGroup> + <ClCompile Include="..\..\issues\5300-temp-dir-path-130.cpp" /> + </ItemGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> + <ImportGroup Label="ExtensionTargets"> + </ImportGroup> +</Project>
\ No newline at end of file diff --git a/libs/filesystem/test/msvc/locale_info/locale_info.vcxproj b/libs/filesystem/test/msvc/locale_info/locale_info.vcxproj index 4b9f69e66..66629ab44 100644 --- a/libs/filesystem/test/msvc/locale_info/locale_info.vcxproj +++ b/libs/filesystem/test/msvc/locale_info/locale_info.vcxproj @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> +<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|Win32"> <Configuration>Debug</Configuration> @@ -20,14 +20,14 @@ <ConfigurationType>Application</ConfigurationType> <UseDebugLibraries>true</UseDebugLibraries> <CharacterSet>Unicode</CharacterSet> - <PlatformToolset>v120</PlatformToolset> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> <UseDebugLibraries>false</UseDebugLibraries> <WholeProgramOptimization>true</WholeProgramOptimization> <CharacterSet>Unicode</CharacterSet> - <PlatformToolset>v120</PlatformToolset> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <ImportGroup Label="ExtensionSettings"> diff --git a/libs/filesystem/test/msvc/long_path_test/long_path_test.vcxproj b/libs/filesystem/test/msvc/long_path_test/long_path_test.vcxproj index 2cd3b3e17..c8e86dd35 100644 --- a/libs/filesystem/test/msvc/long_path_test/long_path_test.vcxproj +++ b/libs/filesystem/test/msvc/long_path_test/long_path_test.vcxproj @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> +<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|Win32"> <Configuration>Debug</Configuration> @@ -20,14 +20,14 @@ <ConfigurationType>Application</ConfigurationType> <UseDebugLibraries>true</UseDebugLibraries> <CharacterSet>Unicode</CharacterSet> - <PlatformToolset>v120</PlatformToolset> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> <UseDebugLibraries>false</UseDebugLibraries> <WholeProgramOptimization>true</WholeProgramOptimization> <CharacterSet>Unicode</CharacterSet> - <PlatformToolset>v120</PlatformToolset> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <ImportGroup Label="ExtensionSettings"> diff --git a/libs/filesystem/test/msvc/macro_default_test/macro_default_test.vcxproj b/libs/filesystem/test/msvc/macro_default_test/macro_default_test.vcxproj index 17884699e..4a24893c0 100644 --- a/libs/filesystem/test/msvc/macro_default_test/macro_default_test.vcxproj +++ b/libs/filesystem/test/msvc/macro_default_test/macro_default_test.vcxproj @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> +<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|Win32"> <Configuration>Debug</Configuration> @@ -20,14 +20,14 @@ <ConfigurationType>Application</ConfigurationType> <UseDebugLibraries>true</UseDebugLibraries> <CharacterSet>Unicode</CharacterSet> - <PlatformToolset>v120</PlatformToolset> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> <UseDebugLibraries>false</UseDebugLibraries> <WholeProgramOptimization>true</WholeProgramOptimization> <CharacterSet>Unicode</CharacterSet> - <PlatformToolset>v120</PlatformToolset> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <ImportGroup Label="ExtensionSettings"> diff --git a/libs/filesystem/test/msvc/odr_test/odr_test.vcxproj b/libs/filesystem/test/msvc/odr_test/odr_test.vcxproj index c3eb0ffa1..a6ea2534d 100644 --- a/libs/filesystem/test/msvc/odr_test/odr_test.vcxproj +++ b/libs/filesystem/test/msvc/odr_test/odr_test.vcxproj @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> +<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|Win32"> <Configuration>Debug</Configuration> @@ -19,13 +19,13 @@ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> <UseDebugLibraries>true</UseDebugLibraries> - <PlatformToolset>v120</PlatformToolset> + <PlatformToolset>v140</PlatformToolset> <CharacterSet>Unicode</CharacterSet> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> <UseDebugLibraries>false</UseDebugLibraries> - <PlatformToolset>v120</PlatformToolset> + <PlatformToolset>v140</PlatformToolset> <WholeProgramOptimization>true</WholeProgramOptimization> <CharacterSet>Unicode</CharacterSet> </PropertyGroup> diff --git a/libs/filesystem/test/msvc/operations_test/operations_test.vcxproj b/libs/filesystem/test/msvc/operations_test/operations_test.vcxproj index b5456d71a..b7be12ae3 100644 --- a/libs/filesystem/test/msvc/operations_test/operations_test.vcxproj +++ b/libs/filesystem/test/msvc/operations_test/operations_test.vcxproj @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> +<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|Win32"> <Configuration>Debug</Configuration> @@ -20,12 +20,12 @@ <ConfigurationType>Application</ConfigurationType> <CharacterSet>Unicode</CharacterSet> <WholeProgramOptimization>true</WholeProgramOptimization> - <PlatformToolset>v120</PlatformToolset> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> <CharacterSet>Unicode</CharacterSet> - <PlatformToolset>v120</PlatformToolset> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <ImportGroup Label="ExtensionSettings"> diff --git a/libs/filesystem/test/msvc/operations_unit_test/operations_unit_test.vcxproj b/libs/filesystem/test/msvc/operations_unit_test/operations_unit_test.vcxproj index f0f46a5dc..67fd0aba4 100644 --- a/libs/filesystem/test/msvc/operations_unit_test/operations_unit_test.vcxproj +++ b/libs/filesystem/test/msvc/operations_unit_test/operations_unit_test.vcxproj @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> +<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|Win32"> <Configuration>Debug</Configuration> @@ -20,12 +20,12 @@ <ConfigurationType>Application</ConfigurationType> <CharacterSet>Unicode</CharacterSet> <WholeProgramOptimization>true</WholeProgramOptimization> - <PlatformToolset>v120</PlatformToolset> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> <CharacterSet>Unicode</CharacterSet> - <PlatformToolset>v120</PlatformToolset> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <ImportGroup Label="ExtensionSettings"> diff --git a/libs/filesystem/test/msvc/path_test/path_test.vcxproj b/libs/filesystem/test/msvc/path_test/path_test.vcxproj index 5d73634fd..354d35c5f 100644 --- a/libs/filesystem/test/msvc/path_test/path_test.vcxproj +++ b/libs/filesystem/test/msvc/path_test/path_test.vcxproj @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> +<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|Win32"> <Configuration>Debug</Configuration> @@ -20,12 +20,12 @@ <ConfigurationType>Application</ConfigurationType> <CharacterSet>Unicode</CharacterSet> <WholeProgramOptimization>true</WholeProgramOptimization> - <PlatformToolset>v120</PlatformToolset> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> <CharacterSet>Unicode</CharacterSet> - <PlatformToolset>v120</PlatformToolset> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <ImportGroup Label="ExtensionSettings"> diff --git a/libs/filesystem/test/msvc/path_test_static/path_test_static.vcxproj b/libs/filesystem/test/msvc/path_test_static/path_test_static.vcxproj index 3380d9582..133661bab 100644 --- a/libs/filesystem/test/msvc/path_test_static/path_test_static.vcxproj +++ b/libs/filesystem/test/msvc/path_test_static/path_test_static.vcxproj @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> +<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|Win32"> <Configuration>Debug</Configuration> @@ -20,14 +20,14 @@ <ConfigurationType>Application</ConfigurationType> <UseDebugLibraries>true</UseDebugLibraries> <CharacterSet>Unicode</CharacterSet> - <PlatformToolset>v120</PlatformToolset> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> <UseDebugLibraries>false</UseDebugLibraries> <WholeProgramOptimization>true</WholeProgramOptimization> <CharacterSet>Unicode</CharacterSet> - <PlatformToolset>v120</PlatformToolset> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <ImportGroup Label="ExtensionSettings"> diff --git a/libs/filesystem/test/msvc/path_timings/path_timings.vcxproj b/libs/filesystem/test/msvc/path_timings/path_timings.vcxproj index 5b03c7c03..8721fb4be 100644 --- a/libs/filesystem/test/msvc/path_timings/path_timings.vcxproj +++ b/libs/filesystem/test/msvc/path_timings/path_timings.vcxproj @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> +<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|Win32"> <Configuration>Debug</Configuration> @@ -20,14 +20,14 @@ <ConfigurationType>Application</ConfigurationType> <UseDebugLibraries>true</UseDebugLibraries> <CharacterSet>Unicode</CharacterSet> - <PlatformToolset>v120</PlatformToolset> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> <UseDebugLibraries>false</UseDebugLibraries> <WholeProgramOptimization>true</WholeProgramOptimization> <CharacterSet>Unicode</CharacterSet> - <PlatformToolset>v120</PlatformToolset> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <ImportGroup Label="ExtensionSettings"> diff --git a/libs/filesystem/test/msvc/path_unit_test/path_unit_test.vcxproj b/libs/filesystem/test/msvc/path_unit_test/path_unit_test.vcxproj index c60500e35..ba86e47d6 100644 --- a/libs/filesystem/test/msvc/path_unit_test/path_unit_test.vcxproj +++ b/libs/filesystem/test/msvc/path_unit_test/path_unit_test.vcxproj @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> +<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|Win32"> <Configuration>Debug</Configuration> @@ -20,12 +20,12 @@ <ConfigurationType>Application</ConfigurationType> <CharacterSet>Unicode</CharacterSet> <WholeProgramOptimization>true</WholeProgramOptimization> - <PlatformToolset>v120</PlatformToolset> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> <CharacterSet>Unicode</CharacterSet> - <PlatformToolset>v120</PlatformToolset> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <ImportGroup Label="ExtensionSettings"> diff --git a/libs/filesystem/test/msvc/recurse_dir_iter_test/recurse_dir_iter_test.vcxproj b/libs/filesystem/test/msvc/recurse_dir_iter_test/recurse_dir_iter_test.vcxproj index 6fc77948e..f1e7ca978 100644 --- a/libs/filesystem/test/msvc/recurse_dir_iter_test/recurse_dir_iter_test.vcxproj +++ b/libs/filesystem/test/msvc/recurse_dir_iter_test/recurse_dir_iter_test.vcxproj @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> +<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|Win32"> <Configuration>Debug</Configuration> @@ -19,13 +19,13 @@ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> <UseDebugLibraries>true</UseDebugLibraries> - <PlatformToolset>v120</PlatformToolset> + <PlatformToolset>v140</PlatformToolset> <CharacterSet>Unicode</CharacterSet> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> <UseDebugLibraries>false</UseDebugLibraries> - <PlatformToolset>v120</PlatformToolset> + <PlatformToolset>v140</PlatformToolset> <WholeProgramOptimization>true</WholeProgramOptimization> <CharacterSet>Unicode</CharacterSet> </PropertyGroup> diff --git a/libs/filesystem/test/msvc/stems/stems.vcxproj b/libs/filesystem/test/msvc/stems/stems.vcxproj index 1e58b0b92..4687d3b56 100644 --- a/libs/filesystem/test/msvc/stems/stems.vcxproj +++ b/libs/filesystem/test/msvc/stems/stems.vcxproj @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> +<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|Win32"> <Configuration>Debug</Configuration> @@ -20,14 +20,14 @@ <ConfigurationType>Application</ConfigurationType> <UseDebugLibraries>true</UseDebugLibraries> <CharacterSet>Unicode</CharacterSet> - <PlatformToolset>v120</PlatformToolset> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> <UseDebugLibraries>false</UseDebugLibraries> <WholeProgramOptimization>true</WholeProgramOptimization> <CharacterSet>Unicode</CharacterSet> - <PlatformToolset>v120</PlatformToolset> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <ImportGroup Label="ExtensionSettings"> diff --git a/libs/filesystem/test/msvc/system_dll/system_dll.vcxproj b/libs/filesystem/test/msvc/system_dll/system_dll.vcxproj index 6415ccfa6..2a5d8555b 100644 --- a/libs/filesystem/test/msvc/system_dll/system_dll.vcxproj +++ b/libs/filesystem/test/msvc/system_dll/system_dll.vcxproj @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> +<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|Win32"> <Configuration>Debug</Configuration> @@ -23,12 +23,12 @@ <ConfigurationType>DynamicLibrary</ConfigurationType> <CharacterSet>Unicode</CharacterSet> <WholeProgramOptimization>true</WholeProgramOptimization> - <PlatformToolset>v120</PlatformToolset> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> <ConfigurationType>DynamicLibrary</ConfigurationType> <CharacterSet>Unicode</CharacterSet> - <PlatformToolset>v120</PlatformToolset> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <ImportGroup Label="ExtensionSettings"> diff --git a/libs/filesystem/test/msvc/system_lib/system_lib.vcxproj b/libs/filesystem/test/msvc/system_lib/system_lib.vcxproj index bf08571c7..0603340c6 100644 --- a/libs/filesystem/test/msvc/system_lib/system_lib.vcxproj +++ b/libs/filesystem/test/msvc/system_lib/system_lib.vcxproj @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> +<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|Win32"> <Configuration>Debug</Configuration> @@ -20,14 +20,14 @@ <ConfigurationType>StaticLibrary</ConfigurationType> <UseDebugLibraries>true</UseDebugLibraries> <CharacterSet>Unicode</CharacterSet> - <PlatformToolset>v120</PlatformToolset> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> <ConfigurationType>StaticLibrary</ConfigurationType> <UseDebugLibraries>false</UseDebugLibraries> <WholeProgramOptimization>true</WholeProgramOptimization> <CharacterSet>Unicode</CharacterSet> - <PlatformToolset>v120</PlatformToolset> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <ImportGroup Label="ExtensionSettings"> diff --git a/libs/filesystem/test/msvc/tut1/tut1.vcxproj b/libs/filesystem/test/msvc/tut1/tut1.vcxproj index 49a628901..95403ce72 100644 --- a/libs/filesystem/test/msvc/tut1/tut1.vcxproj +++ b/libs/filesystem/test/msvc/tut1/tut1.vcxproj @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> +<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|Win32"> <Configuration>Debug</Configuration> @@ -20,12 +20,12 @@ <ConfigurationType>Application</ConfigurationType> <CharacterSet>Unicode</CharacterSet> <WholeProgramOptimization>true</WholeProgramOptimization> - <PlatformToolset>v120</PlatformToolset> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> <CharacterSet>Unicode</CharacterSet> - <PlatformToolset>v120</PlatformToolset> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <ImportGroup Label="ExtensionSettings"> diff --git a/libs/filesystem/test/msvc/tut2/tut2.vcxproj b/libs/filesystem/test/msvc/tut2/tut2.vcxproj index 7a1e355ce..590dc78fd 100644 --- a/libs/filesystem/test/msvc/tut2/tut2.vcxproj +++ b/libs/filesystem/test/msvc/tut2/tut2.vcxproj @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> +<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|Win32"> <Configuration>Debug</Configuration> @@ -20,12 +20,12 @@ <ConfigurationType>Application</ConfigurationType> <CharacterSet>Unicode</CharacterSet> <WholeProgramOptimization>true</WholeProgramOptimization> - <PlatformToolset>v120</PlatformToolset> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> <CharacterSet>Unicode</CharacterSet> - <PlatformToolset>v120</PlatformToolset> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <ImportGroup Label="ExtensionSettings"> diff --git a/libs/filesystem/test/msvc/tut3/tut3.vcxproj b/libs/filesystem/test/msvc/tut3/tut3.vcxproj index eb7ed2db4..c53d0ea06 100644 --- a/libs/filesystem/test/msvc/tut3/tut3.vcxproj +++ b/libs/filesystem/test/msvc/tut3/tut3.vcxproj @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> +<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|Win32"> <Configuration>Debug</Configuration> @@ -20,12 +20,12 @@ <ConfigurationType>Application</ConfigurationType> <CharacterSet>Unicode</CharacterSet> <WholeProgramOptimization>true</WholeProgramOptimization> - <PlatformToolset>v120</PlatformToolset> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> <CharacterSet>Unicode</CharacterSet> - <PlatformToolset>v120</PlatformToolset> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <ImportGroup Label="ExtensionSettings"> diff --git a/libs/filesystem/test/msvc/tut4/tut4.vcxproj b/libs/filesystem/test/msvc/tut4/tut4.vcxproj index 472c23daa..ea22114a6 100644 --- a/libs/filesystem/test/msvc/tut4/tut4.vcxproj +++ b/libs/filesystem/test/msvc/tut4/tut4.vcxproj @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> +<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|Win32"> <Configuration>Debug</Configuration> @@ -20,12 +20,12 @@ <ConfigurationType>Application</ConfigurationType> <CharacterSet>Unicode</CharacterSet> <WholeProgramOptimization>true</WholeProgramOptimization> - <PlatformToolset>v120</PlatformToolset> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> <CharacterSet>Unicode</CharacterSet> - <PlatformToolset>v120</PlatformToolset> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <ImportGroup Label="ExtensionSettings"> diff --git a/libs/filesystem/test/msvc/tut5/tut5.vcxproj b/libs/filesystem/test/msvc/tut5/tut5.vcxproj index 0d6848775..4348f29d9 100644 --- a/libs/filesystem/test/msvc/tut5/tut5.vcxproj +++ b/libs/filesystem/test/msvc/tut5/tut5.vcxproj @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> +<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|Win32"> <Configuration>Debug</Configuration> @@ -20,14 +20,14 @@ <ConfigurationType>Application</ConfigurationType> <UseDebugLibraries>true</UseDebugLibraries> <CharacterSet>Unicode</CharacterSet> - <PlatformToolset>v120</PlatformToolset> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> <UseDebugLibraries>false</UseDebugLibraries> <WholeProgramOptimization>true</WholeProgramOptimization> <CharacterSet>Unicode</CharacterSet> - <PlatformToolset>v120</PlatformToolset> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <ImportGroup Label="ExtensionSettings"> diff --git a/libs/filesystem/test/msvc/tut6a/tut6a.vcxproj b/libs/filesystem/test/msvc/tut6a/tut6a.vcxproj index cbd371ef9..17e1498aa 100644 --- a/libs/filesystem/test/msvc/tut6a/tut6a.vcxproj +++ b/libs/filesystem/test/msvc/tut6a/tut6a.vcxproj @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> +<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|Win32"> <Configuration>Debug</Configuration> @@ -20,14 +20,14 @@ <ConfigurationType>Application</ConfigurationType> <UseDebugLibraries>true</UseDebugLibraries> <CharacterSet>Unicode</CharacterSet> - <PlatformToolset>v120</PlatformToolset> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> <UseDebugLibraries>false</UseDebugLibraries> <WholeProgramOptimization>true</WholeProgramOptimization> <CharacterSet>Unicode</CharacterSet> - <PlatformToolset>v120</PlatformToolset> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <ImportGroup Label="ExtensionSettings"> diff --git a/libs/filesystem/test/msvc/tut6b/tut6b.vcxproj b/libs/filesystem/test/msvc/tut6b/tut6b.vcxproj index 3f43c40ff..34efae5bf 100644 --- a/libs/filesystem/test/msvc/tut6b/tut6b.vcxproj +++ b/libs/filesystem/test/msvc/tut6b/tut6b.vcxproj @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> +<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|Win32"> <Configuration>Debug</Configuration> @@ -20,14 +20,14 @@ <ConfigurationType>Application</ConfigurationType> <UseDebugLibraries>true</UseDebugLibraries> <CharacterSet>Unicode</CharacterSet> - <PlatformToolset>v120</PlatformToolset> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> <UseDebugLibraries>false</UseDebugLibraries> <WholeProgramOptimization>true</WholeProgramOptimization> <CharacterSet>Unicode</CharacterSet> - <PlatformToolset>v120</PlatformToolset> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <ImportGroup Label="ExtensionSettings"> diff --git a/libs/filesystem/test/msvc/tut6c/tut6c.vcxproj b/libs/filesystem/test/msvc/tut6c/tut6c.vcxproj index c34c3003a..84a129062 100644 --- a/libs/filesystem/test/msvc/tut6c/tut6c.vcxproj +++ b/libs/filesystem/test/msvc/tut6c/tut6c.vcxproj @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> +<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|Win32"> <Configuration>Debug</Configuration> @@ -20,14 +20,14 @@ <ConfigurationType>Application</ConfigurationType> <UseDebugLibraries>true</UseDebugLibraries> <CharacterSet>Unicode</CharacterSet> - <PlatformToolset>v120</PlatformToolset> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> <UseDebugLibraries>false</UseDebugLibraries> <WholeProgramOptimization>true</WholeProgramOptimization> <CharacterSet>Unicode</CharacterSet> - <PlatformToolset>v120</PlatformToolset> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <ImportGroup Label="ExtensionSettings"> diff --git a/libs/filesystem/test/msvc/windows_attributes/windows_attributes.vcxproj b/libs/filesystem/test/msvc/windows_attributes/windows_attributes.vcxproj index 0cf6c6c2c..a2a682991 100644 --- a/libs/filesystem/test/msvc/windows_attributes/windows_attributes.vcxproj +++ b/libs/filesystem/test/msvc/windows_attributes/windows_attributes.vcxproj @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> +<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|Win32"> <Configuration>Debug</Configuration> @@ -20,14 +20,14 @@ <ConfigurationType>Application</ConfigurationType> <UseDebugLibraries>true</UseDebugLibraries> <CharacterSet>Unicode</CharacterSet> - <PlatformToolset>v120</PlatformToolset> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> <UseDebugLibraries>false</UseDebugLibraries> <WholeProgramOptimization>true</WholeProgramOptimization> <CharacterSet>Unicode</CharacterSet> - <PlatformToolset>v120</PlatformToolset> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <ImportGroup Label="ExtensionSettings"> diff --git a/libs/filesystem/test/operations_test.cpp b/libs/filesystem/test/operations_test.cpp index 22a8b8853..444c2810d 100644 --- a/libs/filesystem/test/operations_test.cpp +++ b/libs/filesystem/test/operations_test.cpp @@ -56,19 +56,25 @@ inline std::wstring convert(const char* c) return std::wstring(s.begin(), s.end()); } -inline int setenv(const char* name, const fs::path::value_type* val, int) +// Note: these three setenv* functions are not general solutions for the missing +// setenv* problem on Windows. See Microsoft's _putenv for that need, and ticker #7018 +// for discussion and rationale for returning void for this test program, which needs +// to work for both the MSVC Runtime and the Windows Runtime (which does not support +// _putenv). + +inline void setenv(const char* name, const fs::path::value_type* val, int) { - return SetEnvironmentVariableW(convert(name).c_str(), val); + SetEnvironmentVariableW(convert(name).c_str(), val); } -inline int setenv(const char* name, const char* val, int) +inline void setenv(const char* name, const char* val, int) { - return SetEnvironmentVariableW(convert(name).c_str(), convert(val).c_str()); + SetEnvironmentVariableW(convert(name).c_str(), convert(val).c_str()); } -inline int unsetenv(const char* name) +inline void unsetenv(const char* name) { - return SetEnvironmentVariableW(convert(name).c_str(), 0); + SetEnvironmentVariableW(convert(name).c_str(), 0); } #else @@ -165,20 +171,23 @@ namespace // compile-only two argument "do-the-right-thing" tests // verifies that all overload combinations compile without error - void do_not_call() + void do_the_right_thing_tests(bool call_ = false) { - fs::path p; - std::string s; - const char* a = 0; - fs::copy_file(p, p); - fs::copy_file(s, p); - fs::copy_file(a, p); - fs::copy_file(p, s); - fs::copy_file(p, a); - fs::copy_file(s, s); - fs::copy_file(a, s); - fs::copy_file(s, a); - fs::copy_file(a, a); + if (call_) + { + fs::path p; + std::string s; + const char* a = 0; + fs::copy_file(p, p); + fs::copy_file(s, p); + fs::copy_file(a, p); + fs::copy_file(p, s); + fs::copy_file(p, a); + fs::copy_file(s, s); + fs::copy_file(a, s); + fs::copy_file(s, a); + fs::copy_file(a, a); + } } void bad_file_size() @@ -224,42 +233,42 @@ namespace //------------------------------ debugging aids --------------------------------------// - std::ostream& operator<<(std::ostream& os, const fs::file_status& s) - { - if (s.type() == fs::status_error) { os << "status_error"; } - else if (s.type() == fs::file_not_found) { os << "file_not_found"; } - else if (s.type() == fs::regular_file) { os << "regular_file"; } - else if (s.type() == fs::directory_file) { os << "directory_file"; } - else if (s.type() == fs::symlink_file) { os << "symlink_file"; } - else if (s.type() == fs::block_file) { os << "block_file"; } - else if (s.type() == fs::character_file) { os << "character_file"; } - else if (s.type() == fs::fifo_file) { os << "fifo_file"; } - else if (s.type() == fs::socket_file) { os << "socket_file"; } - else if (s.type() == fs::reparse_file) { os << "reparse_file"; } - else if (s.type() == fs::type_unknown) { os << "type_unknown"; } - else { os << "_detail_directory_symlink"; } - return os; - } - - void dump_tree(const fs::path & root) - { - cout << "dumping tree rooted at " << root << endl; - for (fs::recursive_directory_iterator it (root, fs::symlink_option::recurse); - it != fs::recursive_directory_iterator(); - ++it) - { - for (int i = 0; i <= it.level(); ++i) - cout << " "; - - cout << it->path(); - if (fs::is_symlink(it->path())) - { - cout << " [symlink]" << endl; - } - else - cout << endl; - } - } + //std::ostream& operator<<(std::ostream& os, const fs::file_status& s) + //{ + // if (s.type() == fs::status_error) { os << "status_error"; } + // else if (s.type() == fs::file_not_found) { os << "file_not_found"; } + // else if (s.type() == fs::regular_file) { os << "regular_file"; } + // else if (s.type() == fs::directory_file) { os << "directory_file"; } + // else if (s.type() == fs::symlink_file) { os << "symlink_file"; } + // else if (s.type() == fs::block_file) { os << "block_file"; } + // else if (s.type() == fs::character_file) { os << "character_file"; } + // else if (s.type() == fs::fifo_file) { os << "fifo_file"; } + // else if (s.type() == fs::socket_file) { os << "socket_file"; } + // else if (s.type() == fs::reparse_file) { os << "reparse_file"; } + // else if (s.type() == fs::type_unknown) { os << "type_unknown"; } + // else { os << "_detail_directory_symlink"; } + // return os; + //} + + //void dump_tree(const fs::path & root) + //{ + // cout << "dumping tree rooted at " << root << endl; + // for (fs::recursive_directory_iterator it (root, fs::symlink_option::recurse); + // it != fs::recursive_directory_iterator(); + // ++it) + // { + // for (int i = 0; i <= it.level(); ++i) + // cout << " "; + + // cout << it->path(); + // if (fs::is_symlink(it->path())) + // { + // cout << " [symlink]" << endl; + // } + // else + // cout << endl; + // } + //} // exception_tests() ---------------------------------------------------------------// @@ -447,21 +456,21 @@ namespace BOOST_TEST(ec); dir_itr_exception = false; - try { fs::directory_iterator it("nosuchdirectory"); } + try { fs::directory_iterator itx("nosuchdirectory"); } catch (const fs::filesystem_error &) { dir_itr_exception = true; } BOOST_TEST(dir_itr_exception); ec.clear(); - fs::directory_iterator it2("nosuchdirectory", ec); + fs::directory_iterator it2x("nosuchdirectory", ec); BOOST_TEST(ec); dir_itr_exception = false; try { - error_code ec; - fs::directory_iterator it("nosuchdirectory", ec); - BOOST_TEST(ec); - BOOST_TEST(ec == boost::system::errc::no_such_file_or_directory); + error_code ecx; + fs::directory_iterator itx("nosuchdirectory", ecx); + BOOST_TEST(ecx); + BOOST_TEST(ecx == boost::system::errc::no_such_file_or_directory); } catch (const fs::filesystem_error &) { dir_itr_exception = true; } BOOST_TEST(!dir_itr_exception); @@ -547,14 +556,14 @@ namespace BOOST_TEST(dir_itr->path() != p); // test case reported in comment to SourceForge bug tracker [937606] - fs::directory_iterator it(dir); - const fs::path p1 = (*it++).path(); - BOOST_TEST(it != fs::directory_iterator()); - const fs::path p2 = (*it++).path(); + fs::directory_iterator itx(dir); + const fs::path p1 = (*itx++).path(); + BOOST_TEST(itx != fs::directory_iterator()); + const fs::path p2 = (*itx++).path(); BOOST_TEST(p1 != p2); - ++it; - ++it; - BOOST_TEST(it == fs::directory_iterator()); + ++itx; + ++itx; + BOOST_TEST(itx == fs::directory_iterator()); } // Windows has a tricky special case when just the root-name is given, @@ -563,17 +572,17 @@ namespace if (platform == "Windows") { fs::path root_name_path(fs::current_path().root_name()); - fs::directory_iterator it(root_name_path); - BOOST_TEST(it != fs::directory_iterator()); -// BOOST_TEST(fs::exists((*it).path())); - BOOST_TEST(fs::exists(it->path())); - BOOST_TEST(it->path().parent_path() == root_name_path); + fs::directory_iterator itx(root_name_path); + BOOST_TEST(itx != fs::directory_iterator()); +// BOOST_TEST(fs::exists((*itx).path())); + BOOST_TEST(fs::exists(itx->path())); + BOOST_TEST(itx->path().parent_path() == root_name_path); bool found(false); do { - if (it->path().filename() == temp_dir.filename()) + if (itx->path().filename() == temp_dir.filename()) found = true; - } while (++it != fs::directory_iterator()); + } while (++itx != fs::directory_iterator()); BOOST_TEST(found); } @@ -594,7 +603,7 @@ namespace int walk_tree(bool recursive) { - cout << " walk_tree" << endl; +// cout << " walk_tree" << endl; error_code ec; int d1f1_count = 0; for (fs::recursive_directory_iterator it (dir, @@ -602,7 +611,7 @@ namespace it != fs::recursive_directory_iterator(); it.increment(ec)) { - cout << " " << it->path() << endl; +// cout << " " << it->path() << endl; if (it->path().filename() == "d1f1") ++d1f1_count; } @@ -718,12 +727,12 @@ namespace cout << "create_hard_link_tests..." << endl; fs::path from_ph(dir / "f3"); - fs::path f1(dir / "f1"); + fs::path f1x(dir / "f1"); BOOST_TEST(!fs::exists(from_ph)); - BOOST_TEST(fs::exists(f1)); + BOOST_TEST(fs::exists(f1x)); bool create_hard_link_ok(true); - try { fs::create_hard_link(f1, from_ph); } + try { fs::create_hard_link(f1x, from_ph); } catch (const fs::filesystem_error & ex) { create_hard_link_ok = false; @@ -740,10 +749,10 @@ namespace << " *** For information only ***\n" " create_hard_link() succeeded\n"; BOOST_TEST(fs::exists(from_ph)); - BOOST_TEST(fs::exists(f1)); - BOOST_TEST(fs::equivalent(from_ph, f1)); + BOOST_TEST(fs::exists(f1x)); + BOOST_TEST(fs::equivalent(from_ph, f1x)); BOOST_TEST(fs::hard_link_count(from_ph) == 2); - BOOST_TEST(fs::hard_link_count(f1) == 2); + BOOST_TEST(fs::hard_link_count(f1x) == 2); } // Although tests may be running on a FAT or other file system that does @@ -764,10 +773,10 @@ namespace cout << "create_symlink_tests..." << endl; fs::path from_ph(dir / "f4"); - fs::path f1(dir / "f1"); + fs::path f1x(dir / "f1"); BOOST_TEST(!fs::exists(from_ph)); - BOOST_TEST(fs::exists(f1)); - try { fs::create_symlink(f1, from_ph); } + BOOST_TEST(fs::exists(f1x)); + try { fs::create_symlink(f1x, from_ph); } catch (const fs::filesystem_error & ex) { create_symlink_ok = false; @@ -785,9 +794,9 @@ namespace " create_symlink() succeeded\n"; BOOST_TEST(fs::exists(from_ph)); BOOST_TEST(fs::is_symlink(from_ph)); - BOOST_TEST(fs::exists(f1)); - BOOST_TEST(fs::equivalent(from_ph, f1)); - BOOST_TEST(fs::read_symlink(from_ph) == f1); + BOOST_TEST(fs::exists(f1x)); + BOOST_TEST(fs::equivalent(from_ph, f1x)); + BOOST_TEST(fs::read_symlink(from_ph) == f1x); fs::file_status stat = fs::symlink_status(from_ph); BOOST_TEST(fs::exists(stat)); @@ -880,8 +889,8 @@ namespace { cout << "rename_tests..." << endl; - fs::path f1(dir / "f1"); - BOOST_TEST(fs::exists(f1)); + fs::path f1x(dir / "f1"); + BOOST_TEST(fs::exists(f1x)); // error: rename a non-existent old file BOOST_TEST(!fs::exists(d1 / "f99")); @@ -892,7 +901,7 @@ namespace BOOST_TEST(CHECK_EXCEPTION(n1b, ENOENT)); // error: rename an existing file to "" - renamer n2(f1, ""); + renamer n2(f1x, ""); BOOST_TEST(CHECK_EXCEPTION(n2, ENOENT)); // rename an existing file to an existent file @@ -1217,32 +1226,32 @@ namespace // remove_tests --------------------------------------------------------------------// - void remove_tests(const fs::path& dir) + void remove_tests(const fs::path& dirx) { cout << "remove_tests..." << endl; // remove() file - fs::path f1 = dir / "shortlife"; - BOOST_TEST(!fs::exists(f1)); - create_file(f1, ""); - BOOST_TEST(fs::exists(f1)); - BOOST_TEST(!fs::is_directory(f1)); - BOOST_TEST(fs::remove(f1)); - BOOST_TEST(!fs::exists(f1)); + fs::path f1x = dirx / "shortlife"; + BOOST_TEST(!fs::exists(f1x)); + create_file(f1x, ""); + BOOST_TEST(fs::exists(f1x)); + BOOST_TEST(!fs::is_directory(f1x)); + BOOST_TEST(fs::remove(f1x)); + BOOST_TEST(!fs::exists(f1x)); BOOST_TEST(!fs::remove("no-such-file")); BOOST_TEST(!fs::remove("no-such-directory/no-such-file")); // remove() directory - fs::path d1 = dir / "shortlife_dir"; - BOOST_TEST(!fs::exists(d1)); - fs::create_directory(d1); - BOOST_TEST(fs::exists(d1)); - BOOST_TEST(fs::is_directory(d1)); - BOOST_TEST(fs::is_empty(d1)); - bad_remove_dir = dir; + fs::path d1x = dirx / "shortlife_dir"; + BOOST_TEST(!fs::exists(d1x)); + fs::create_directory(d1x); + BOOST_TEST(fs::exists(d1x)); + BOOST_TEST(fs::is_directory(d1x)); + BOOST_TEST(fs::is_empty(d1x)); + bad_remove_dir = dirx; BOOST_TEST(CHECK_EXCEPTION(bad_remove, ENOTEMPTY)); - BOOST_TEST(fs::remove(d1)); - BOOST_TEST(!fs::exists(d1)); + BOOST_TEST(fs::remove(d1x)); + BOOST_TEST(!fs::exists(d1x)); } // remove_symlink_tests ------------------------------------------------------------// @@ -1288,25 +1297,25 @@ namespace BOOST_TEST(!fs::is_symlink(link)); // remove() symbolic link to file - fs::path f1 = "link_target"; - fs::remove(f1); // remove any residue from past tests - BOOST_TEST(!fs::exists(f1)); - create_file(f1, ""); - BOOST_TEST(fs::exists(f1)); - BOOST_TEST(!fs::is_directory(f1)); - BOOST_TEST(fs::is_regular_file(f1)); + fs::path f1x = "link_target"; + fs::remove(f1x); // remove any residue from past tests + BOOST_TEST(!fs::exists(f1x)); + create_file(f1x, ""); + BOOST_TEST(fs::exists(f1x)); + BOOST_TEST(!fs::is_directory(f1x)); + BOOST_TEST(fs::is_regular_file(f1x)); link = "non_dangling_link"; - fs::create_symlink(f1, link); + fs::create_symlink(f1x, link); BOOST_TEST(fs::exists(link)); BOOST_TEST(!fs::is_directory(link)); BOOST_TEST(fs::is_regular_file(link)); BOOST_TEST(fs::is_symlink(link)); BOOST_TEST(fs::remove(link)); - BOOST_TEST(fs::exists(f1)); + BOOST_TEST(fs::exists(f1x)); BOOST_TEST(!fs::exists(link)); BOOST_TEST(!fs::is_symlink(link)); - BOOST_TEST(fs::remove(f1)); - BOOST_TEST(!fs::exists(f1)); + BOOST_TEST(fs::remove(f1x)); + BOOST_TEST(!fs::exists(f1x)); } // absolute_tests -----------------------------------------------------------------// @@ -1463,40 +1472,40 @@ namespace // copy_file_tests ------------------------------------------------------------------// - void copy_file_tests(const fs::path& f1, const fs::path& d1) + void copy_file_tests(const fs::path& f1x, const fs::path& d1x) { cout << "copy_file_tests..." << endl; - BOOST_TEST(fs::exists(f1)); - fs::remove(d1 / "f2"); // remove possible residue from prior testing - BOOST_TEST(fs::exists(d1)); - BOOST_TEST(!fs::exists(d1 / "f2")); - cout << " copy " << f1 << " to " << d1 / "f2" << endl; - fs::copy_file(f1, d1 / "f2"); + BOOST_TEST(fs::exists(f1x)); + fs::remove(d1x / "f2"); // remove possible residue from prior testing + BOOST_TEST(fs::exists(d1x)); + BOOST_TEST(!fs::exists(d1x / "f2")); + cout << " copy " << f1x << " to " << d1x / "f2" << endl; + fs::copy_file(f1x, d1x / "f2"); cout << " copy complete" << endl; - BOOST_TEST(fs::exists(f1)); - BOOST_TEST(fs::exists(d1 / "f2")); - BOOST_TEST(!fs::is_directory(d1 / "f2")); - verify_file(d1 / "f2", "file-f1"); + BOOST_TEST(fs::exists(f1x)); + BOOST_TEST(fs::exists(d1x / "f2")); + BOOST_TEST(!fs::is_directory(d1x / "f2")); + verify_file(d1x / "f2", "file-f1"); bool copy_ex_ok = false; - try { fs::copy_file(f1, d1 / "f2"); } + try { fs::copy_file(f1x, d1x / "f2"); } catch (const fs::filesystem_error &) { copy_ex_ok = true; } BOOST_TEST(copy_ex_ok); copy_ex_ok = false; - try { fs::copy_file(f1, d1 / "f2", fs::copy_option::fail_if_exists); } + try { fs::copy_file(f1x, d1x / "f2", fs::copy_option::fail_if_exists); } catch (const fs::filesystem_error &) { copy_ex_ok = true; } BOOST_TEST(copy_ex_ok); - create_file(d1 / "f2", "1234567890"); - BOOST_TEST_EQ(fs::file_size(d1 / "f2"), 10U); + create_file(d1x / "f2", "1234567890"); + BOOST_TEST_EQ(fs::file_size(d1x / "f2"), 10U); copy_ex_ok = true; - try { fs::copy_file(f1, d1 / "f2", fs::copy_option::overwrite_if_exists); } + try { fs::copy_file(f1x, d1x / "f2", fs::copy_option::overwrite_if_exists); } catch (const fs::filesystem_error &) { copy_ex_ok = false; } BOOST_TEST(copy_ex_ok); - BOOST_TEST_EQ(fs::file_size(d1 / "f2"), 7U); - verify_file(d1 / "f2", "file-f1"); + BOOST_TEST_EQ(fs::file_size(d1x / "f2"), 7U); + verify_file(d1x / "f2", "file-f1"); } // symlink_status_tests -------------------------------------------------------------// @@ -1563,22 +1572,22 @@ namespace // copy_symlink_tests ---------------------------------------------------------------// - void copy_symlink_tests(const fs::path& f1, const fs::path& d1) + void copy_symlink_tests(const fs::path& f1x, const fs::path& d1x) { cout << "copy_symlink_tests..." << endl; - BOOST_TEST(fs::exists(f1)); - BOOST_TEST(fs::exists(d1)); - fs::path sym1(d1 / "symlink1"); + BOOST_TEST(fs::exists(f1x)); + BOOST_TEST(fs::exists(d1x)); + fs::path sym1(d1x / "symlink1"); fs::remove(sym1); // remove possible residue from prior testing - fs::create_symlink(f1, sym1); + fs::create_symlink(f1x, sym1); BOOST_TEST(fs::exists(sym1)); BOOST_TEST(fs::is_symlink(sym1)); - fs::path sym2(d1 / "symlink2"); + fs::path sym2(d1x / "symlink2"); fs::copy_symlink(sym1, sym2); BOOST_TEST(fs::exists(sym2)); BOOST_TEST(fs::is_symlink(sym2)); - //fs::path sym3(d1 / "symlink3"); + //fs::path sym3(d1x / "symlink3"); //fs::copy(sym1, sym3); //BOOST_TEST(fs::exists(sym3)); //BOOST_TEST(fs::is_symlink(sym3)); @@ -1589,30 +1598,30 @@ namespace BOOST_TEST(copy_ex_ok); copy_ex_ok = false; - try { fs::copy_symlink(f1, "new-symlink2"); } // should fail; f1 not symlink + try { fs::copy_symlink(f1x, "new-symlink2"); } // should fail; f1x not symlink catch (const fs::filesystem_error &) { copy_ex_ok = true; } BOOST_TEST(copy_ex_ok); } // write_time_tests ----------------------------------------------------------------// - void write_time_tests(const fs::path& dir) + void write_time_tests(const fs::path& dirx) { cout << "write_time_tests..." << endl; - fs::path f1 = dir / "foobar2"; - create_file(f1, "foobar2"); - BOOST_TEST(fs::exists(f1)); - BOOST_TEST(!fs::is_directory(f1)); - BOOST_TEST(fs::is_regular_file(f1)); - BOOST_TEST(fs::file_size(f1) == 7); - verify_file(f1, "foobar2"); + fs::path f1x = dirx / "foobar2"; + create_file(f1x, "foobar2"); + BOOST_TEST(fs::exists(f1x)); + BOOST_TEST(!fs::is_directory(f1x)); + BOOST_TEST(fs::is_regular_file(f1x)); + BOOST_TEST(fs::file_size(f1x) == 7); + verify_file(f1x, "foobar2"); // Some file system report last write time as local (FAT), while // others (NTFS) report it as UTC. The C standard does not specify // if time_t is local or UTC. - std::time_t ft = fs::last_write_time(f1); + std::time_t ft = fs::last_write_time(f1x); cout << "\n UTC last_write_time() for a file just created is " << std::asctime(std::gmtime(&ft)) << endl; @@ -1620,15 +1629,15 @@ namespace cout << "\n Year is " << tmp->tm_year << endl; --tmp->tm_year; cout << " Change year to " << tmp->tm_year << endl; - fs::last_write_time(f1, std::mktime(tmp)); - std::time_t ft2 = fs::last_write_time(f1); + fs::last_write_time(f1x, std::mktime(tmp)); + std::time_t ft2 = fs::last_write_time(f1x); cout << " last_write_time() for the file is now " << std::asctime(std::gmtime(&ft2)) << endl; - BOOST_TEST(ft != fs::last_write_time(f1)); + BOOST_TEST(ft != fs::last_write_time(f1x)); cout << "\n Reset to current time" << endl; - fs::last_write_time(f1, ft); - double time_diff = std::difftime(ft, fs::last_write_time(f1)); + fs::last_write_time(f1x, ft); + double time_diff = std::difftime(ft, fs::last_write_time(f1x)); cout << " original last_write_time() - current last_write_time() is " << time_diff << " seconds" << endl; @@ -1800,20 +1809,20 @@ namespace // equivalent_tests ----------------------------------------------------------------// - void equivalent_tests(const fs::path& f1) + void equivalent_tests(const fs::path& f1x) { cout << "equivalent_tests..." << endl; BOOST_TEST(CHECK_EXCEPTION(bad_equivalent, ENOENT)); - BOOST_TEST(fs::equivalent(f1, dir / "f1")); + BOOST_TEST(fs::equivalent(f1x, dir / "f1")); BOOST_TEST(fs::equivalent(dir, d1 / "..")); - BOOST_TEST(!fs::equivalent(f1, dir)); - BOOST_TEST(!fs::equivalent(dir, f1)); + BOOST_TEST(!fs::equivalent(f1x, dir)); + BOOST_TEST(!fs::equivalent(dir, f1x)); BOOST_TEST(!fs::equivalent(d1, d2)); BOOST_TEST(!fs::equivalent(dir, ng)); BOOST_TEST(!fs::equivalent(ng, dir)); - BOOST_TEST(!fs::equivalent(f1, ng)); - BOOST_TEST(!fs::equivalent(ng, f1)); + BOOST_TEST(!fs::equivalent(f1x, ng)); + BOOST_TEST(!fs::equivalent(ng, f1x)); } // temp_directory_path_tests -------------------------------------------------------// @@ -1828,7 +1837,7 @@ namespace bool m_empty; previous_value(const char* name) - : m_string(name) + : m_name(name) , m_empty (true) { if(const char* value = getenv(name)) @@ -1862,6 +1871,40 @@ namespace { cout << "temp_directory_path_tests..." << endl; +#if defined BOOST_WINDOWS_API + + // Test ticket #5300, temp_directory_path failure on Windows with path length > 130. + // (This test failed prior to the fix being applied.) + { + const wchar_t long_name[] = + L"12345678901234567890123456789012345678901234567890" + L"12345678901234567890123456789012345678901234567890" + L"12345678901234567890123456789012345678901234567890#" // total 151 chars + ; + fs::path p (temp_dir); + p /= long_name; + fs::create_directory(p); + + guarded_env_var tmp_guard("TMP", p.wstring().c_str()); + error_code ec; + fs::path tmp_path = fs::temp_directory_path(ec); + cout << "#5300, temp_directory_path() returned " << tmp_path << endl; + BOOST_TEST(!ec); + BOOST_TEST(p == tmp_path); + fs::remove(p); + } + + // Test ticket #10388, null character at end of filesystem::temp_directory_path path + { + guarded_env_var tmp_guard("TMP", fs::initial_path().wstring().c_str()); + + error_code ec; + fs::path tmp_path = fs::temp_directory_path(ec); + cout << "#10388, temp_directory_path() returned " << tmp_path << endl; + BOOST_TEST(tmp_path == fs::initial_path()); + } + +#endif BOOST_TEST(!fs::temp_directory_path().empty()); BOOST_TEST(exists(fs::temp_directory_path())); fs::path ph = fs::temp_directory_path()/"temp_directory_path_test.txt"; @@ -1881,7 +1924,7 @@ namespace BOOST_TEST(!exists(ph)); } - fs::path test_temp_dir = fs::initial_path(); + fs::path test_temp_dir = temp_dir; #if defined BOOST_POSIX_API { @@ -1929,65 +1972,69 @@ namespace #endif #if defined BOOST_WINDOWS_API - { - struct guarded_tmp_vars - { - guarded_env_var m_tmp ; - guarded_env_var m_temp ; - guarded_env_var m_userprofile; - guarded_tmp_vars - ( const fs::path::value_type* tmp - , const fs::path::value_type* temp - , const fs::path::value_type* userprofile - ) - : m_tmp ("TMP" , tmp ) - , m_temp ("TEMP" , temp ) - , m_userprofile("USERPROFILE", userprofile) - {} - }; + struct guarded_tmp_vars + { + guarded_env_var m_tmp ; + guarded_env_var m_temp ; + guarded_env_var m_localappdata; + guarded_env_var m_userprofile; + + guarded_tmp_vars + ( const fs::path::value_type* tmp + , const fs::path::value_type* temp + , const fs::path::value_type* localappdata + , const fs::path::value_type* userprofile + ) + : m_tmp ("TMP" , tmp ) + , m_temp ("TEMP" , temp ) + , m_localappdata ("LOCALAPPDATA" , localappdata) + , m_userprofile ("USERPROFILE" , userprofile ) + {} + }; - // should NEVER throw - the windows directory or current_path always exists - { - guarded_tmp_vars vars(0, 0, 0); - fs::path ph = fs::temp_directory_path(); - - BOOST_TEST(test_temp_dir != ph); - } + // test the GetWindowsDirectoryW()/Temp fallback + { + guarded_tmp_vars vars(0, 0, 0, 0); + error_code ec; + fs::path ph = fs::temp_directory_path(ec); + BOOST_TEST(!ec); + cout << "Fallback test, temp_directory_path() returned " << ph << endl; + } - // should NEVER fail - the windows directory or current_path always exists - { - guarded_tmp_vars vars(0, 0, 0); - error_code ec; - fs::path ph = fs::temp_directory_path(ec); - BOOST_TEST(!ec); - } + { + guarded_tmp_vars vars(test_temp_dir.c_str(), 0, 0, 0); + fs::path ph = fs::temp_directory_path(); + BOOST_TEST(equivalent(test_temp_dir, ph)); + } + { + guarded_tmp_vars vars(0, test_temp_dir.c_str(), 0, 0); + fs::path ph = fs::temp_directory_path(); + BOOST_TEST(equivalent(test_temp_dir, ph)); + } - { - guarded_tmp_vars vars(test_temp_dir.c_str(), 0, 0); - fs::path ph = fs::temp_directory_path(); - BOOST_TEST(equivalent(test_temp_dir, ph)); - } - { - guarded_tmp_vars vars(0, test_temp_dir.c_str(), 0); - fs::path ph = fs::temp_directory_path(); - BOOST_TEST(equivalent(test_temp_dir, ph)); - } - { - guarded_tmp_vars vars(0, 0, test_temp_dir.c_str()); - fs::path ph = fs::temp_directory_path(); - BOOST_TEST(equivalent(test_temp_dir, ph)); - } + fs::create_directory(test_temp_dir / L"Temp"); + { + guarded_tmp_vars vars(0, 0, test_temp_dir.c_str(), 0); + fs::path ph = fs::temp_directory_path(); + BOOST_TEST(equivalent(test_temp_dir/L"Temp", ph)); + cout << "temp_directory_path() returned " << ph << endl; + } + { + guarded_tmp_vars vars(0, 0, 0, test_temp_dir.c_str()); + fs::path ph = fs::temp_directory_path(); + BOOST_TEST(equivalent(test_temp_dir/L"Temp", ph)); + cout << "temp_directory_path() returned " << ph << endl; } #endif } // _tests --------------------------------------------------------------------------// - void _tests() - { - cout << "_tests..." << endl; - } + //void _tests() + //{ + // cout << "_tests..." << endl; + //} } // unnamed namespace @@ -2035,6 +2082,7 @@ int cpp_main(int argc, char* argv[]) cout << "API is " << platform << endl; cout << "initial_path() is " << fs::initial_path() << endl; fs::path ip = fs::initial_path(); + do_the_right_thing_tests(); // compile-only tests, but call anyhow to suppress warnings for (fs::path::const_iterator it = ip.begin(); it != ip.end(); ++it) { @@ -2127,7 +2175,7 @@ int cpp_main(int argc, char* argv[]) // above was added just to simplify testing, but it ended up detecting // a bug (failure to close an internal search handle). cout << "post-test removal complete" << endl; - BOOST_TEST(!fs::exists(dir)); +// BOOST_TEST(!fs::exists(dir)); // nice test, but doesn't play well with TortoiseGit cache } cout << "returning from main()" << endl; diff --git a/libs/filesystem/test/operations_unit_test.cpp b/libs/filesystem/test/operations_unit_test.cpp index 8cedffefd..ce4e7f608 100644 --- a/libs/filesystem/test/operations_unit_test.cpp +++ b/libs/filesystem/test/operations_unit_test.cpp @@ -31,7 +31,6 @@ # error Configuration not supported: Boost.Filesystem V3 and later requires std::wstring support # endif -#include <boost/foreach.hpp> #include <boost/system/error_code.hpp> #include <boost/detail/lightweight_test.hpp> #include <boost/detail/lightweight_main.hpp> @@ -160,10 +159,10 @@ namespace } #endif - BOOST_FOREACH(directory_entry& x, directory_iterator(".")) + for (directory_iterator itr("."); itr != directory_iterator(); ++itr) { - CHECK(!x.path().empty()); - //cout << " " << x.path() << "\n"; + CHECK(!itr->path().empty()); + //cout << " " << itr->path() << "\n"; } cout << "directory_iterator_test complete" << endl; @@ -221,10 +220,11 @@ namespace } #endif - BOOST_FOREACH(directory_entry& x, recursive_directory_iterator("..")) + for (recursive_directory_iterator itr(".."); + itr != recursive_directory_iterator(); ++itr) { - CHECK(!x.path().empty()); - //cout << " " << x.path() << "\n"; + CHECK(!itr->path().empty()); + //cout << " " << itr->path() << "\n"; } cout << "recursive_directory_iterator_test complete" << endl; diff --git a/libs/filesystem/test/path_test.cpp b/libs/filesystem/test/path_test.cpp index 406dc9a67..071423048 100644 --- a/libs/filesystem/test/path_test.cpp +++ b/libs/filesystem/test/path_test.cpp @@ -642,27 +642,27 @@ namespace // operator == and != are implemented separately, so test separately - path p1("fe/fi/fo/fum"); - path p2(p1); - path p3("fe/fi/fo/fumm"); - BOOST_TEST(p1.string() != p3.string()); + path p101("fe/fi/fo/fum"); + path p102(p101); + path p103("fe/fi/fo/fumm"); + BOOST_TEST(p101.string() != p103.string()); // check each overload - BOOST_TEST(p1 != p3); - BOOST_TEST(p1 != p3.string()); - BOOST_TEST(p1 != p3.string().c_str()); - BOOST_TEST(p1.string() != p3); - BOOST_TEST(p1.string().c_str() != p3); + BOOST_TEST(p101 != p103); + BOOST_TEST(p101 != p103.string()); + BOOST_TEST(p101 != p103.string().c_str()); + BOOST_TEST(p101.string() != p103); + BOOST_TEST(p101.string().c_str() != p103); - p3 = p2; - BOOST_TEST(p1.string() == p3.string()); + p103 = p102; + BOOST_TEST(p101.string() == p103.string()); // check each overload - BOOST_TEST(p1 == p3); - BOOST_TEST(p1 == p3.string()); - BOOST_TEST(p1 == p3.string().c_str()); - BOOST_TEST(p1.string() == p3); - BOOST_TEST(p1.string().c_str() == p3); + BOOST_TEST(p101 == p103); + BOOST_TEST(p101 == p103.string()); + BOOST_TEST(p101 == p103.string().c_str()); + BOOST_TEST(p101.string() == p103); + BOOST_TEST(p101.string().c_str() == p103); if (platform == "Windows") { @@ -1567,14 +1567,15 @@ namespace PATH_TEST_EQ(path("foo/") / "bar", "foo/bar"); append_test_aux("foo/", "bar", "foo/bar"); - PATH_TEST_EQ(path("foo/") / "/bar", "foo//bar"); - append_test_aux("foo/", "/bar", "foo//bar"); if (platform == "Windows") { PATH_TEST_EQ(path("foo") / "bar", "foo\\bar"); append_test_aux("foo", "bar", "foo\\bar"); + PATH_TEST_EQ(path("foo\\") / "\\bar", "foo\\\\bar"); + append_test_aux("foo\\", "\\bar", "foo\\\\bar"); + // hand created test case specific to Windows PATH_TEST_EQ(path("c:") / "bar", "c:bar"); append_test_aux("c:", "bar", "c:bar"); @@ -1802,10 +1803,10 @@ int cpp_main(int, char*[]) p3 = p2; BOOST_TEST(p1.string() == p3.string()); - path p4("foobar"); - BOOST_TEST(p4.string() == "foobar"); - p4 = p4; // self-assignment - BOOST_TEST(p4.string() == "foobar"); + path p04("foobar"); + BOOST_TEST(p04.string() == "foobar"); + p04 = p04; // self-assignment + BOOST_TEST(p04.string() == "foobar"); construction_tests(); append_tests(); diff --git a/libs/filesystem/test/path_unit_test.cpp b/libs/filesystem/test/path_unit_test.cpp index 67ccb9fac..fe3a42794 100644 --- a/libs/filesystem/test/path_unit_test.cpp +++ b/libs/filesystem/test/path_unit_test.cpp @@ -33,8 +33,7 @@ #include <boost/filesystem/detail/utf8_codecvt_facet.hpp> // for imbue tests #include "test_codecvt.hpp" // for codecvt arg tests -#include <boost/detail/lightweight_test.hpp> -#include <boost/detail/lightweight_main.hpp> +#include <boost/detail/lightweight_test_report.hpp> #include <boost/smart_ptr.hpp> // used constructor tests #include <boost/functional/hash.hpp> @@ -126,9 +125,9 @@ namespace << L"\"\n" ; } - void check(bool ok, const char* file, int line) + void check(bool ok_, const char* file, int line) { - if (ok) return; + if (ok_) return; ++::boost::detail::test_errors(); @@ -827,17 +826,17 @@ namespace void test_overloads() { std::cout << "testing overloads..." << std::endl; - std::string s("hello"); + std::string sto("hello"); const char a[] = "goodbye"; - path p1(s); - path p2(s.c_str()); + path p1(sto); + path p2(sto.c_str()); path p3(a); path p4("foo"); - std::wstring ws(L"hello"); + std::wstring wsto(L"hello"); const wchar_t wa[] = L"goodbye"; - path wp1(ws); - path wp2(ws.c_str()); + path wp1(wsto); + path wp2(wsto.c_str()); path wp3(wa); path wp4(L"foo"); } @@ -1038,7 +1037,7 @@ namespace // // //--------------------------------------------------------------------------------------// -int cpp_main(int, char*[]) +int test_main(int, char*[]) { // document state of critical macros #ifdef BOOST_POSIX_API diff --git a/libs/filesystem/test/test_codecvt.hpp b/libs/filesystem/test/test_codecvt.hpp index 9ce8b75d1..666805ec1 100644 --- a/libs/filesystem/test/test_codecvt.hpp +++ b/libs/filesystem/test/test_codecvt.hpp @@ -44,7 +44,7 @@ wchar_t* to, wchar_t* to_end, wchar_t*& to_next) const { for (; from != from_end && to != to_end; ++from, ++to) - *to = *from + 1; + *to = wchar_t(*from + 1); if (to == to_end) return error; *to = L'\0'; |