townforge/filesystem
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed check for mklink on Windows.

Browse Source 
For some unknown reason, Windows 8.1 system shell returns error code 1 when
invoking mklink to test if it exists. To work around this we now analyze
output of the command in the Jamfile. As an added bonus, the test is not
compiled when mklink is not supported.
This commit is contained in:
Andrey Semashev 2020-05-04 20:00:40 +03:00
parent ef819fe699
commit 89b5152e86
2 changed files with 28 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
test/Jamfile.v2
View File

@ -26,6 +26,30 @@ if [ os.environ UBSAN ]
<library>/boost/filesystem//boost_filesystem/<visibility>global ;
}
# The rule checks we're running on Windows that supports mklink command (Vista and later)
rule check-mklink ( properties * )
{
local result = <build>no ;
if <target-os>windows in $(properties)
{
# mklink is a builtin shell command, so we can't check if an executable exists.
# Testing the exit status of the mklink command (in the hope that it will be different
# when the command is not supported) is inconclusive as for some reason Windows 8.1 shell
# always returns exit code of 1. We have to match the output of the command. :(
# Note that the output may be localized, so pick some part that is likely to be stable regardless
# of localization.
local output = [ SHELL "mklink /?" : exit-status ] ;
if [ MATCH (MKLINK) : $(output[1]) ]
{
result = <build>yes ;
}
}
#ECHO Result: $(result) ;
return $(result) ;
}
run config_info.cpp : : : <link>shared <test-info>always_show_run_output ;
run config_info.cpp : : : <link>static <test-info>always_show_run_output : config_info_static ;
run convenience_test.cpp ;
@ -52,4 +76,5 @@ run quick.cpp ;
# Tests for specific issues
run issues/70-71-copy.cpp ;
run issues/99_canonical_with_junction_point.cpp : : : <build>no <target-os>windows:<build>yes ;
run issues/99_canonical_with_junction_point.cpp : : : <conditional>@check-mklink ;

7
test/issues/99_canonical_with_junction_point.cpp
View File

@ -8,7 +8,9 @@
// Library home page: http://www.boost.org/libs/filesystem
#include <boost/filesystem.hpp>
#include <boost/system/error_code.hpp>
#include <boost/core/lightweight_test.hpp>
#include <cstdlib>
#include <iostream>
#include <vector>
@ -32,11 +34,6 @@ struct TmpDir
// This failed before due to broken handling of absolute paths and ignored ReparseTag
int main()
{
if (std::system("mklink /?") != 0)
{
std::cerr << "Junction points not supported. Skipping test" << std::endl;
return boost::report_errors();
}
const fs::path cwd = fs::current_path();
const TmpDir tmp(cwd);
const fs::path junction = tmp.path / "junction";