From f2f699eb783d0fd5d8d99e71a8fc2b25ccfaba03 Mon Sep 17 00:00:00 2001 From: Beman Dawes Date: Tue, 30 Nov 2010 15:07:43 +0000 Subject: [PATCH] Use to improve regression test error reporting on remote systems [SVN r66896] --- v3/test/convenience_test.cpp | 3 ++- v3/test/deprecated_test.cpp | 3 ++- v3/test/fstream_test.cpp | 3 ++- v3/test/msvc10/filesystem-v3.sln | 10 ++++++++++ v3/test/operations_test.cpp | 3 ++- v3/test/operations_unit_test.cpp | 3 ++- v3/test/path_test.cpp | 3 ++- v3/test/path_unit_test.cpp | 3 ++- 8 files changed, 24 insertions(+), 7 deletions(-) diff --git a/v3/test/convenience_test.cpp b/v3/test/convenience_test.cpp index 6cc7241..17675a6 100644 --- a/v3/test/convenience_test.cpp +++ b/v3/test/convenience_test.cpp @@ -32,6 +32,7 @@ using fs::path; namespace sys = boost::system; #include +#include #include #include #include @@ -58,7 +59,7 @@ namespace // ------------------------------------------------------------------------------------// -int main(int, char*[]) +int cpp_main(int, char*[]) { // create_directories() tests --------------------------------------------------------// diff --git a/v3/test/deprecated_test.cpp b/v3/test/deprecated_test.cpp index 927c4b7..de82ff8 100644 --- a/v3/test/deprecated_test.cpp +++ b/v3/test/deprecated_test.cpp @@ -23,6 +23,7 @@ #include #include +#include namespace fs = boost::filesystem; using boost::filesystem::path; @@ -190,7 +191,7 @@ namespace //--------------------------------------------------------------------------------------// -int main(int /*argc*/, char* /*argv*/[]) +int cpp_main(int /*argc*/, char* /*argv*/[]) { // The choice of platform is make at runtime rather than compile-time // so that compile errors for all platforms will be detected even though diff --git a/v3/test/fstream_test.cpp b/v3/test/fstream_test.cpp index 72ee8d7..9b777a4 100644 --- a/v3/test/fstream_test.cpp +++ b/v3/test/fstream_test.cpp @@ -41,6 +41,7 @@ namespace fs = boost::filesystem; #endif #include +#include #if defined(_MSC_VER) # pragma warning(push) // Save warning settings. @@ -144,7 +145,7 @@ namespace } // test } // unnamed namespace -int main(int argc, char*[]) +int cpp_main(int argc, char*[]) { if (argc > 1) cleanup = false; diff --git a/v3/test/msvc10/filesystem-v3.sln b/v3/test/msvc10/filesystem-v3.sln index ec4aa9c..a4b360e 100644 --- a/v3/test/msvc10/filesystem-v3.sln +++ b/v3/test/msvc10/filesystem-v3.sln @@ -29,6 +29,12 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tut4", "tut4\tut4.vcxproj", EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "windows_attributes", "windows_attributes\windows_attributes.vcxproj", "{FC5C770F-3017-4021-8DAF-C5DCA3FDF005}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "scratch_test", "scratch_test\scratch_test.vcxproj", "{214D1FDB-CC19-47C6-8DDD-59C5424C6850}" + ProjectSection(ProjectDependencies) = postProject + {F94CCADD-A90B-480C-A304-C19D015D36B1} = {F94CCADD-A90B-480C-A304-C19D015D36B1} + {FFD738F7-96F0-445C-81EA-551665EF53D1} = {FFD738F7-96F0-445C-81EA-551665EF53D1} + EndProjectSection +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 @@ -89,6 +95,10 @@ Global {256EA89A-E073-4CE8-B675-BE2FBC6B2691}.Release|Win32.Build.0 = Release|Win32 {FC5C770F-3017-4021-8DAF-C5DCA3FDF005}.Debug|Win32.ActiveCfg = Debug|Win32 {FC5C770F-3017-4021-8DAF-C5DCA3FDF005}.Release|Win32.ActiveCfg = Release|Win32 + {214D1FDB-CC19-47C6-8DDD-59C5424C6850}.Debug|Win32.ActiveCfg = Debug|Win32 + {214D1FDB-CC19-47C6-8DDD-59C5424C6850}.Debug|Win32.Build.0 = Debug|Win32 + {214D1FDB-CC19-47C6-8DDD-59C5424C6850}.Release|Win32.ActiveCfg = Release|Win32 + {214D1FDB-CC19-47C6-8DDD-59C5424C6850}.Release|Win32.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/v3/test/operations_test.cpp b/v3/test/operations_test.cpp index 473c8fe..24b372d 100644 --- a/v3/test/operations_test.cpp +++ b/v3/test/operations_test.cpp @@ -30,6 +30,7 @@ namespace fs = boost::filesystem; #include +#include using boost::system::error_code; using boost::system::system_category; @@ -1617,7 +1618,7 @@ namespace // // //------------------------------------------------------------------------------------// -int main(int argc, char* argv[]) +int cpp_main(int argc, char* argv[]) { // document state of critical macros #ifdef BOOST_POSIX_API diff --git a/v3/test/operations_unit_test.cpp b/v3/test/operations_unit_test.cpp index ec82057..04de601 100644 --- a/v3/test/operations_unit_test.cpp +++ b/v3/test/operations_unit_test.cpp @@ -34,6 +34,7 @@ #include // make sure filesystem.hpp works #include #include +#include #include using namespace boost::filesystem; @@ -214,7 +215,7 @@ namespace // // //--------------------------------------------------------------------------------------// -int main() +int cpp_main(int, char*[]) { // document state of critical macros #ifdef BOOST_POSIX_API diff --git a/v3/test/path_test.cpp b/v3/test/path_test.cpp index b40da33..f04cf6d 100644 --- a/v3/test/path_test.cpp +++ b/v3/test/path_test.cpp @@ -44,6 +44,7 @@ namespace fs = boost::filesystem; using boost::filesystem::path; #include +#include #define PATH_CHECK(a, b) check(a, b, __FILE__, __LINE__) #define CHECK_EQUAL(a,b) check_equal(a, b, __FILE__, __LINE__) @@ -1575,7 +1576,7 @@ namespace // // //--------------------------------------------------------------------------------------// -int main(int, char*[]) +int cpp_main(int, char*[]) { // The choice of platform is make at runtime rather than compile-time // so that compile errors for all platforms will be detected even though diff --git a/v3/test/path_unit_test.cpp b/v3/test/path_unit_test.cpp index 4501b5c..92d4e73 100644 --- a/v3/test/path_unit_test.cpp +++ b/v3/test/path_unit_test.cpp @@ -41,6 +41,7 @@ #include // for imbue tests #include "test_codecvt.hpp" // for codecvt arg tests #include +#include #include // used constructor tests #include @@ -963,7 +964,7 @@ namespace // // //--------------------------------------------------------------------------------------// -int main(int, char*[]) +int cpp_main(int, char*[]) { // document state of critical macros #ifdef BOOST_POSIX_API