Subject: [Boost-commit] svn:boost r78057 - in trunk/libs/filesystem: example test test/msvc10 test/msvc10/convenience_test test/msvc10/deprecated_test test/msvc10/file_status test/msvc10/long_path_test test/msvc10/operations_test test/msvc10/operations_unit_test test/msvc10/path_test test/msvc10/path_test_static test/msvc10/path_unit_test test/msvc10/windows_attributes
From: bdawes_at_[hidden]
Date: 2012-04-17 21:31:55
Author: bemandawes
Date: 2012-04-17 21:31:53 EDT (Tue, 17 Apr 2012)
New Revision: 78057
URL: http://svn.boost.org/trac/boost/changeset/78057
Log:
filesystem testing change: use <boost/test/prg_exec_monitor.hpp> by default, define BOOST_LIGHTWEIGHT_MAIN to use <boost/detail/lightweight_main.hpp>. This gives us the better exception reporting of <boost/test/prg_exec_monitor.hpp> but provides easy fallback to <boost/detail/lightweight_main.hpp> if desired.
Text files modified:
trunk/libs/filesystem/example/file_status.cpp | 7 ++++++-
trunk/libs/filesystem/test/Jamfile.v2 | 1 +
trunk/libs/filesystem/test/convenience_test.cpp | 8 +++++++-
trunk/libs/filesystem/test/deprecated_test.cpp | 7 ++++++-
trunk/libs/filesystem/test/long_path_test.cpp | 7 ++++++-
trunk/libs/filesystem/test/msvc10/convenience_test/convenience_test.vcxproj | 3 +++
trunk/libs/filesystem/test/msvc10/deprecated_test/deprecated_test.vcxproj | 3 +++
trunk/libs/filesystem/test/msvc10/file_status/file_status.vcxproj | 3 +++
trunk/libs/filesystem/test/msvc10/filesystem-v3.sln | 35 +++++++++++++++++++++++++++++++++++
trunk/libs/filesystem/test/msvc10/long_path_test/long_path_test.vcxproj | 3 +++
trunk/libs/filesystem/test/msvc10/operations_test/operations_test.vcxproj | 3 +++
trunk/libs/filesystem/test/msvc10/operations_unit_test/operations_unit_test.vcxproj | 3 +++
trunk/libs/filesystem/test/msvc10/path_test/path_test.vcxproj | 3 +++
trunk/libs/filesystem/test/msvc10/path_test_static/path_test_static.vcxproj | 3 +++
trunk/libs/filesystem/test/msvc10/path_unit_test/path_unit_test.vcxproj | 3 +++
trunk/libs/filesystem/test/msvc10/windows_attributes/windows_attributes.vcxproj | 3 +++
trunk/libs/filesystem/test/operations_test.cpp | 7 ++++++-
trunk/libs/filesystem/test/operations_unit_test.cpp | 8 +++++++-
trunk/libs/filesystem/test/path_test.cpp | 7 ++++++-
trunk/libs/filesystem/test/path_unit_test.cpp | 8 +++++++-
trunk/libs/filesystem/test/windows_attributes.cpp | 8 +++++++-
21 files changed, 124 insertions(+), 9 deletions(-)
Modified: trunk/libs/filesystem/example/file_status.cpp
==============================================================================
--- trunk/libs/filesystem/example/file_status.cpp (original)
+++ trunk/libs/filesystem/example/file_status.cpp 2012-04-17 21:31:53 EDT (Tue, 17 Apr 2012)
@@ -11,7 +11,12 @@
#include <boost/config.hpp>
#include <boost/version.hpp>
#include <boost/filesystem.hpp>
-#include <boost/detail/lightweight_main.hpp>
+
+#ifndef BOOST_LIGHTWEIGHT_MAIN
+# include <boost/test/prg_exec_monitor.hpp>
+#else
+# include <boost/detail/lightweight_main.hpp>
+#endif
using std::cout; using std::endl;
using namespace boost::filesystem;
Modified: trunk/libs/filesystem/test/Jamfile.v2
==============================================================================
--- trunk/libs/filesystem/test/Jamfile.v2 (original)
+++ trunk/libs/filesystem/test/Jamfile.v2 2012-04-17 21:31:53 EDT (Tue, 17 Apr 2012)
@@ -8,6 +8,7 @@
: requirements
<library>/boost/filesystem//boost_filesystem
<library>/boost/system//boost_system
+ <library>/boost/test//boost_prg_exec_monitor
<toolset>msvc:<asynch-exceptions>on
;
Modified: trunk/libs/filesystem/test/convenience_test.cpp
==============================================================================
--- trunk/libs/filesystem/test/convenience_test.cpp (original)
+++ trunk/libs/filesystem/test/convenience_test.cpp 2012-04-17 21:31:53 EDT (Tue, 17 Apr 2012)
@@ -26,7 +26,13 @@
# endif
#include <boost/detail/lightweight_test.hpp>
-#include <boost/detail/lightweight_main.hpp>
+
+#ifndef BOOST_LIGHTWEIGHT_MAIN
+# include <boost/test/prg_exec_monitor.hpp>
+#else
+# include <boost/detail/lightweight_main.hpp>
+#endif
+
#include <boost/bind.hpp>
#include <fstream>
#include <iostream>
Modified: trunk/libs/filesystem/test/deprecated_test.cpp
==============================================================================
--- trunk/libs/filesystem/test/deprecated_test.cpp (original)
+++ trunk/libs/filesystem/test/deprecated_test.cpp 2012-04-17 21:31:53 EDT (Tue, 17 Apr 2012)
@@ -21,7 +21,12 @@
# endif
#include <boost/detail/lightweight_test.hpp>
-#include <boost/detail/lightweight_main.hpp>
+
+#ifndef BOOST_LIGHTWEIGHT_MAIN
+# include <boost/test/prg_exec_monitor.hpp>
+#else
+# include <boost/detail/lightweight_main.hpp>
+#endif
namespace fs = boost::filesystem;
using boost::filesystem::path;
Modified: trunk/libs/filesystem/test/long_path_test.cpp
==============================================================================
--- trunk/libs/filesystem/test/long_path_test.cpp (original)
+++ trunk/libs/filesystem/test/long_path_test.cpp 2012-04-17 21:31:53 EDT (Tue, 17 Apr 2012)
@@ -18,7 +18,12 @@
using namespace boost::filesystem;
#include <boost/detail/lightweight_test.hpp>
-#include <boost/detail/lightweight_main.hpp>
+
+#ifndef BOOST_LIGHTWEIGHT_MAIN
+# include <boost/test/prg_exec_monitor.hpp>
+#else
+# include <boost/detail/lightweight_main.hpp>
+#endif
namespace
{
Modified: trunk/libs/filesystem/test/msvc10/convenience_test/convenience_test.vcxproj
==============================================================================
--- trunk/libs/filesystem/test/msvc10/convenience_test/convenience_test.vcxproj (original)
+++ trunk/libs/filesystem/test/msvc10/convenience_test/convenience_test.vcxproj 2012-04-17 21:31:53 EDT (Tue, 17 Apr 2012)
@@ -92,6 +92,9 @@
<ClCompile Include="..\..\convenience_test.cpp" />
</ItemGroup>
<ItemGroup>
+ <ProjectReference Include="..\exec_monitor_dll\exec_monitor_dll.vcxproj">
+ <Project>{0ea788ca-fa52-4290-a4d0-f616390b203b}</Project>
+ </ProjectReference>
<ProjectReference Include="..\filesystem_dll\filesystem_dll.vcxproj">
<Project>{ffd738f7-96f0-445c-81ea-551665ef53d1}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
Modified: trunk/libs/filesystem/test/msvc10/deprecated_test/deprecated_test.vcxproj
==============================================================================
--- trunk/libs/filesystem/test/msvc10/deprecated_test/deprecated_test.vcxproj (original)
+++ trunk/libs/filesystem/test/msvc10/deprecated_test/deprecated_test.vcxproj 2012-04-17 21:31:53 EDT (Tue, 17 Apr 2012)
@@ -92,6 +92,9 @@
<ClCompile Include="..\..\deprecated_test.cpp" />
</ItemGroup>
<ItemGroup>
+ <ProjectReference Include="..\exec_monitor_dll\exec_monitor_dll.vcxproj">
+ <Project>{0ea788ca-fa52-4290-a4d0-f616390b203b}</Project>
+ </ProjectReference>
<ProjectReference Include="..\filesystem_dll\filesystem_dll.vcxproj">
<Project>{ffd738f7-96f0-445c-81ea-551665ef53d1}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
Modified: trunk/libs/filesystem/test/msvc10/file_status/file_status.vcxproj
==============================================================================
--- trunk/libs/filesystem/test/msvc10/file_status/file_status.vcxproj (original)
+++ trunk/libs/filesystem/test/msvc10/file_status/file_status.vcxproj 2012-04-17 21:31:53 EDT (Tue, 17 Apr 2012)
@@ -87,6 +87,9 @@
<ClCompile Include="..\..\..\example\file_status.cpp" />
</ItemGroup>
<ItemGroup>
+ <ProjectReference Include="..\exec_monitor_dll\exec_monitor_dll.vcxproj">
+ <Project>{0ea788ca-fa52-4290-a4d0-f616390b203b}</Project>
+ </ProjectReference>
<ProjectReference Include="..\filesystem_dll\filesystem_dll.vcxproj">
<Project>{ffd738f7-96f0-445c-81ea-551665ef53d1}</Project>
</ProjectReference>
Modified: trunk/libs/filesystem/test/msvc10/filesystem-v3.sln
==============================================================================
--- trunk/libs/filesystem/test/msvc10/filesystem-v3.sln (original)
+++ trunk/libs/filesystem/test/msvc10/filesystem-v3.sln 2012-04-17 21:31:53 EDT (Tue, 17 Apr 2012)
@@ -2,12 +2,18 @@
Microsoft Visual Studio Solution File, Format Version 11.00
# Visual C++ Express 2010
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "path_unit_test", "path_unit_test\path_unit_test.vcxproj", "{3C77F610-2E31-4087-9DF2-7CD45198A02D}"
+ ProjectSection(ProjectDependencies) = postProject
+ {0EA788CA-FA52-4290-A4D0-F616390B203B} = {0EA788CA-FA52-4290-A4D0-F616390B203B}
+ EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "operations_unit_test", "operations_unit_test\operations_unit_test.vcxproj", "{5DAF595A-4640-4F86-8A5F-E54E3E4CE7D0}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "operations_test", "operations_test\operations_test.vcxproj", "{8BB7E604-46EF-42BE-ABB5-D7044B3E8A40}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "path_test", "path_test\path_test.vcxproj", "{F3D230C4-9185-4C2B-AB0E-0F0D28D8268C}"
+ ProjectSection(ProjectDependencies) = postProject
+ {0EA788CA-FA52-4290-A4D0-F616390B203B} = {0EA788CA-FA52-4290-A4D0-F616390B203B}
+ EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "system_dll", "system_dll\system_dll.vcxproj", "{F94CCADD-A90B-480C-A304-C19D015D36B1}"
EndProject
@@ -28,6 +34,9 @@
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tut4", "tut4\tut4.vcxproj", "{256EA89A-E073-4CE8-B675-BE2FBC6B2691}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "windows_attributes", "windows_attributes\windows_attributes.vcxproj", "{FC5C770F-3017-4021-8DAF-C5DCA3FDF005}"
+ ProjectSection(ProjectDependencies) = postProject
+ {0EA788CA-FA52-4290-A4D0-F616390B203B} = {0EA788CA-FA52-4290-A4D0-F616390B203B}
+ EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tut5", "tut5\tut5.vcxproj", "{5C9B3380-3C6E-45CC-986A-16D245E27E58}"
ProjectSection(ProjectDependencies) = postProject
@@ -89,6 +98,20 @@
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "path_test_static", "path_test_static\path_test_static.vcxproj", "{3B3010C5-D6D7-4320-A992-4EA61F256279}"
+ ProjectSection(ProjectDependencies) = postProject
+ {272DFC15-6292-49DF-B457-6784A183EAC3} = {272DFC15-6292-49DF-B457-6784A183EAC3}
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ticket_test", "ticket_test\ticket_test.vcxproj", "{AD2B00B7-D2CB-47B9-B6BA-15652188E072}"
+ ProjectSection(ProjectDependencies) = postProject
+ {0EA788CA-FA52-4290-A4D0-F616390B203B} = {0EA788CA-FA52-4290-A4D0-F616390B203B}
+ {F94CCADD-A90B-480C-A304-C19D015D36B1} = {F94CCADD-A90B-480C-A304-C19D015D36B1}
+ {FFD738F7-96F0-445C-81EA-551665EF53D1} = {FFD738F7-96F0-445C-81EA-551665EF53D1}
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "exec_monitor_dll", "exec_monitor_dll\exec_monitor_dll.vcxproj", "{0EA788CA-FA52-4290-A4D0-F616390B203B}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "exec_monitor_lib", "exec_monitor_lib\exec_monitor_lib.vcxproj", "{272DFC15-6292-49DF-B457-6784A183EAC3}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -204,6 +227,18 @@
{3B3010C5-D6D7-4320-A992-4EA61F256279}.Debug|Win32.Build.0 = Debug|Win32
{3B3010C5-D6D7-4320-A992-4EA61F256279}.Release|Win32.ActiveCfg = Release|Win32
{3B3010C5-D6D7-4320-A992-4EA61F256279}.Release|Win32.Build.0 = Release|Win32
+ {AD2B00B7-D2CB-47B9-B6BA-15652188E072}.Debug|Win32.ActiveCfg = Debug|Win32
+ {AD2B00B7-D2CB-47B9-B6BA-15652188E072}.Debug|Win32.Build.0 = Debug|Win32
+ {AD2B00B7-D2CB-47B9-B6BA-15652188E072}.Release|Win32.ActiveCfg = Release|Win32
+ {AD2B00B7-D2CB-47B9-B6BA-15652188E072}.Release|Win32.Build.0 = Release|Win32
+ {0EA788CA-FA52-4290-A4D0-F616390B203B}.Debug|Win32.ActiveCfg = Debug|Win32
+ {0EA788CA-FA52-4290-A4D0-F616390B203B}.Debug|Win32.Build.0 = Debug|Win32
+ {0EA788CA-FA52-4290-A4D0-F616390B203B}.Release|Win32.ActiveCfg = Release|Win32
+ {0EA788CA-FA52-4290-A4D0-F616390B203B}.Release|Win32.Build.0 = Release|Win32
+ {272DFC15-6292-49DF-B457-6784A183EAC3}.Debug|Win32.ActiveCfg = Debug|Win32
+ {272DFC15-6292-49DF-B457-6784A183EAC3}.Debug|Win32.Build.0 = Debug|Win32
+ {272DFC15-6292-49DF-B457-6784A183EAC3}.Release|Win32.ActiveCfg = Release|Win32
+ {272DFC15-6292-49DF-B457-6784A183EAC3}.Release|Win32.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Modified: trunk/libs/filesystem/test/msvc10/long_path_test/long_path_test.vcxproj
==============================================================================
--- trunk/libs/filesystem/test/msvc10/long_path_test/long_path_test.vcxproj (original)
+++ trunk/libs/filesystem/test/msvc10/long_path_test/long_path_test.vcxproj 2012-04-17 21:31:53 EDT (Tue, 17 Apr 2012)
@@ -87,6 +87,9 @@
<ClCompile Include="..\..\long_path_test.cpp" />
</ItemGroup>
<ItemGroup>
+ <ProjectReference Include="..\exec_monitor_dll\exec_monitor_dll.vcxproj">
+ <Project>{0ea788ca-fa52-4290-a4d0-f616390b203b}</Project>
+ </ProjectReference>
<ProjectReference Include="..\filesystem_dll\filesystem_dll.vcxproj">
<Project>{ffd738f7-96f0-445c-81ea-551665ef53d1}</Project>
</ProjectReference>
Modified: trunk/libs/filesystem/test/msvc10/operations_test/operations_test.vcxproj
==============================================================================
--- trunk/libs/filesystem/test/msvc10/operations_test/operations_test.vcxproj (original)
+++ trunk/libs/filesystem/test/msvc10/operations_test/operations_test.vcxproj 2012-04-17 21:31:53 EDT (Tue, 17 Apr 2012)
@@ -91,6 +91,9 @@
<ClCompile Include="..\..\operations_test.cpp" />
</ItemGroup>
<ItemGroup>
+ <ProjectReference Include="..\exec_monitor_dll\exec_monitor_dll.vcxproj">
+ <Project>{0ea788ca-fa52-4290-a4d0-f616390b203b}</Project>
+ </ProjectReference>
<ProjectReference Include="..\filesystem_dll\filesystem_dll.vcxproj">
<Project>{ffd738f7-96f0-445c-81ea-551665ef53d1}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
Modified: trunk/libs/filesystem/test/msvc10/operations_unit_test/operations_unit_test.vcxproj
==============================================================================
--- trunk/libs/filesystem/test/msvc10/operations_unit_test/operations_unit_test.vcxproj (original)
+++ trunk/libs/filesystem/test/msvc10/operations_unit_test/operations_unit_test.vcxproj 2012-04-17 21:31:53 EDT (Tue, 17 Apr 2012)
@@ -94,6 +94,9 @@
<ClCompile Include="..\..\operations_unit_test.cpp" />
</ItemGroup>
<ItemGroup>
+ <ProjectReference Include="..\exec_monitor_dll\exec_monitor_dll.vcxproj">
+ <Project>{0ea788ca-fa52-4290-a4d0-f616390b203b}</Project>
+ </ProjectReference>
<ProjectReference Include="..\filesystem_dll\filesystem_dll.vcxproj">
<Project>{ffd738f7-96f0-445c-81ea-551665ef53d1}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
Modified: trunk/libs/filesystem/test/msvc10/path_test/path_test.vcxproj
==============================================================================
--- trunk/libs/filesystem/test/msvc10/path_test/path_test.vcxproj (original)
+++ trunk/libs/filesystem/test/msvc10/path_test/path_test.vcxproj 2012-04-17 21:31:53 EDT (Tue, 17 Apr 2012)
@@ -92,6 +92,9 @@
<ClCompile Include="..\..\path_test.cpp" />
</ItemGroup>
<ItemGroup>
+ <ProjectReference Include="..\exec_monitor_dll\exec_monitor_dll.vcxproj">
+ <Project>{0ea788ca-fa52-4290-a4d0-f616390b203b}</Project>
+ </ProjectReference>
<ProjectReference Include="..\filesystem_dll\filesystem_dll.vcxproj">
<Project>{ffd738f7-96f0-445c-81ea-551665ef53d1}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
Modified: trunk/libs/filesystem/test/msvc10/path_test_static/path_test_static.vcxproj
==============================================================================
--- trunk/libs/filesystem/test/msvc10/path_test_static/path_test_static.vcxproj (original)
+++ trunk/libs/filesystem/test/msvc10/path_test_static/path_test_static.vcxproj 2012-04-17 21:31:53 EDT (Tue, 17 Apr 2012)
@@ -91,6 +91,9 @@
<ClCompile Include="..\..\path_test.cpp" />
</ItemGroup>
<ItemGroup>
+ <ProjectReference Include="..\exec_monitor_lib\exec_monitor_lib.vcxproj">
+ <Project>{272dfc15-6292-49df-b457-6784a183eac3}</Project>
+ </ProjectReference>
<ProjectReference Include="..\filesystem_lib\filesystem_lib.vcxproj">
<Project>{2c1770a4-4ac3-4102-9d36-e652dbb686d8}</Project>
</ProjectReference>
Modified: trunk/libs/filesystem/test/msvc10/path_unit_test/path_unit_test.vcxproj
==============================================================================
--- trunk/libs/filesystem/test/msvc10/path_unit_test/path_unit_test.vcxproj (original)
+++ trunk/libs/filesystem/test/msvc10/path_unit_test/path_unit_test.vcxproj 2012-04-17 21:31:53 EDT (Tue, 17 Apr 2012)
@@ -92,6 +92,9 @@
<ClCompile Include="..\..\path_unit_test.cpp" />
</ItemGroup>
<ItemGroup>
+ <ProjectReference Include="..\exec_monitor_dll\exec_monitor_dll.vcxproj">
+ <Project>{0ea788ca-fa52-4290-a4d0-f616390b203b}</Project>
+ </ProjectReference>
<ProjectReference Include="..\filesystem_dll\filesystem_dll.vcxproj">
<Project>{ffd738f7-96f0-445c-81ea-551665ef53d1}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
Modified: trunk/libs/filesystem/test/msvc10/windows_attributes/windows_attributes.vcxproj
==============================================================================
--- trunk/libs/filesystem/test/msvc10/windows_attributes/windows_attributes.vcxproj (original)
+++ trunk/libs/filesystem/test/msvc10/windows_attributes/windows_attributes.vcxproj 2012-04-17 21:31:53 EDT (Tue, 17 Apr 2012)
@@ -79,6 +79,9 @@
<ClCompile Include="..\..\windows_attributes.cpp" />
</ItemGroup>
<ItemGroup>
+ <ProjectReference Include="..\exec_monitor_dll\exec_monitor_dll.vcxproj">
+ <Project>{0ea788ca-fa52-4290-a4d0-f616390b203b}</Project>
+ </ProjectReference>
<ProjectReference Include="..\filesystem_dll\filesystem_dll.vcxproj">
<Project>{ffd738f7-96f0-445c-81ea-551665ef53d1}</Project>
</ProjectReference>
Modified: trunk/libs/filesystem/test/operations_test.cpp
==============================================================================
--- trunk/libs/filesystem/test/operations_test.cpp (original)
+++ trunk/libs/filesystem/test/operations_test.cpp 2012-04-17 21:31:53 EDT (Tue, 17 Apr 2012)
@@ -26,7 +26,12 @@
#include <boost/cerrno.hpp>
#include <boost/detail/lightweight_test.hpp>
-#include <boost/detail/lightweight_main.hpp>
+
+#ifndef BOOST_LIGHTWEIGHT_MAIN
+# include <boost/test/prg_exec_monitor.hpp>
+#else
+# include <boost/detail/lightweight_main.hpp>
+#endif
namespace fs = boost::filesystem;
using boost::system::error_code;
Modified: trunk/libs/filesystem/test/operations_unit_test.cpp
==============================================================================
--- trunk/libs/filesystem/test/operations_unit_test.cpp (original)
+++ trunk/libs/filesystem/test/operations_unit_test.cpp 2012-04-17 21:31:53 EDT (Tue, 17 Apr 2012)
@@ -33,7 +33,13 @@
#include <boost/system/error_code.hpp>
#include <boost/detail/lightweight_test.hpp>
-#include <boost/detail/lightweight_main.hpp>
+
+#ifndef BOOST_LIGHTWEIGHT_MAIN
+# include <boost/test/prg_exec_monitor.hpp>
+#else
+# include <boost/detail/lightweight_main.hpp>
+#endif
+
#include <iostream>
using namespace boost::filesystem;
Modified: trunk/libs/filesystem/test/path_test.cpp
==============================================================================
--- trunk/libs/filesystem/test/path_test.cpp (original)
+++ trunk/libs/filesystem/test/path_test.cpp 2012-04-17 21:31:53 EDT (Tue, 17 Apr 2012)
@@ -64,7 +64,12 @@
#include <cstring>
#include <cassert>
#include <boost/detail/lightweight_test.hpp>
-#include <boost/detail/lightweight_main.hpp>
+
+#ifndef BOOST_LIGHTWEIGHT_MAIN
+# include <boost/test/prg_exec_monitor.hpp>
+#else
+# include <boost/detail/lightweight_main.hpp>
+#endif
namespace fs = boost::filesystem;
using boost::filesystem::path;
Modified: trunk/libs/filesystem/test/path_unit_test.cpp
==============================================================================
--- trunk/libs/filesystem/test/path_unit_test.cpp (original)
+++ trunk/libs/filesystem/test/path_unit_test.cpp 2012-04-17 21:31:53 EDT (Tue, 17 Apr 2012)
@@ -34,7 +34,13 @@
#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>
+
+#ifndef BOOST_LIGHTWEIGHT_MAIN
+# include <boost/test/prg_exec_monitor.hpp>
+#else
+# include <boost/detail/lightweight_main.hpp>
+#endif
+
#include <boost/smart_ptr.hpp> // used constructor tests
#include <boost/functional/hash.hpp>
Modified: trunk/libs/filesystem/test/windows_attributes.cpp
==============================================================================
--- trunk/libs/filesystem/test/windows_attributes.cpp (original)
+++ trunk/libs/filesystem/test/windows_attributes.cpp 2012-04-17 21:31:53 EDT (Tue, 17 Apr 2012)
@@ -14,7 +14,13 @@
//--------------------------------------------------------------------------------------//
#include <boost/filesystem.hpp>
-#include <boost/detail/lightweight_main.hpp>
+
+#ifndef BOOST_LIGHTWEIGHT_MAIN
+# include <boost/test/prg_exec_monitor.hpp>
+#else
+# include <boost/detail/lightweight_main.hpp>
+#endif
+
#include <windows.h>
#include <map>
#include <utility>