summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Makefile.am9
-rwxr-xr-xmsvc/gtest-md.vcproj4
-rw-r--r--msvc/gtest.sln40
-rw-r--r--msvc/gtest.vcproj4
-rwxr-xr-xmsvc/gtest_main-md.vcproj4
-rw-r--r--msvc/gtest_main.vcproj4
-rwxr-xr-xmsvc/gtest_prod_test-md.vcproj4
-rw-r--r--msvc/gtest_prod_test.vcproj4
-rwxr-xr-xmsvc/gtest_unittest-md.vcproj4
-rw-r--r--msvc/gtest_unittest.vcproj4
-rw-r--r--src/gtest.cc5
11 files changed, 21 insertions, 65 deletions
diff --git a/Makefile.am b/Makefile.am
index 19d64ea..0b829ed 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -21,19 +21,14 @@ EXTRA_DIST = \
# MSVC project files
EXTRA_DIST += \
+ msvc/gtest-md.sln \
msvc/gtest.sln \
+ msvc/gtest-md.vcproj \
msvc/gtest.vcproj \
- msvc/gtest_color_test_.vcproj \
- msvc/gtest_env_var_test_.vcproj \
- msvc/gtest_environment_test.vcproj \
msvc/gtest_main-md.vcproj \
msvc/gtest_main.vcproj \
- msvc/gtest-md.sln \
- msvc/gtest-md.vcproj \
- msvc/gtest_output_test_.vcproj \
msvc/gtest_prod_test-md.vcproj \
msvc/gtest_prod_test.vcproj \
- msvc/gtest_uninitialized_test_.vcproj \
msvc/gtest_unittest-md.vcproj \
msvc/gtest_unittest.vcproj
diff --git a/msvc/gtest-md.vcproj b/msvc/gtest-md.vcproj
index 8acb85b..abc3c39 100755
--- a/msvc/gtest-md.vcproj
+++ b/msvc/gtest-md.vcproj
@@ -26,7 +26,7 @@
RuntimeLibrary="3"
UsePrecompiledHeader="0"
WarningLevel="3"
- Detect64BitPortabilityProblems="TRUE"
+ Detect64BitPortabilityProblems="FALSE"
DebugInformationFormat="4"/>
<Tool
Name="VCCustomBuildTool"/>
@@ -65,7 +65,7 @@
RuntimeLibrary="2"
UsePrecompiledHeader="0"
WarningLevel="3"
- Detect64BitPortabilityProblems="TRUE"
+ Detect64BitPortabilityProblems="FALSE"
DebugInformationFormat="3"/>
<Tool
Name="VCCustomBuildTool"/>
diff --git a/msvc/gtest.sln b/msvc/gtest.sln
index 5619c12..ef4b057 100644
--- a/msvc/gtest.sln
+++ b/msvc/gtest.sln
@@ -11,30 +11,10 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtest_unittest", "gtest_uni
ProjectSection(ProjectDependencies) = postProject
EndProjectSection
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtest_environment_test", "gtest_environment_test.vcproj", "{DF5FA93D-DC03-41A6-A18C-079198633450}"
- ProjectSection(ProjectDependencies) = postProject
- EndProjectSection
-EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtest_prod_test", "gtest_prod_test.vcproj", "{24848551-EF4F-47E8-9A9D-EA4D49BC3ECA}"
ProjectSection(ProjectDependencies) = postProject
EndProjectSection
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtest_color_test_", "gtest_color_test_.vcproj", "{ABC5A7E8-072C-4A2D-B186-19EA5394B9C6}"
- ProjectSection(ProjectDependencies) = postProject
- EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtest_env_var_test_", "gtest_env_var_test_.vcproj", "{569C6F70-F41C-47F3-A622-8A88DC43D452}"
- ProjectSection(ProjectDependencies) = postProject
- EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtest_output_test_", "gtest_output_test_.vcproj", "{A4903F73-ED6C-4972-863E-F7355EB0145E}"
- ProjectSection(ProjectDependencies) = postProject
- EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtest_uninitialized_test_", "gtest_uninitialized_test_.vcproj", "{42B8A077-E162-4540-A688-246296ACAC1D}"
- ProjectSection(ProjectDependencies) = postProject
- EndProjectSection
-EndProject
Global
GlobalSection(SolutionConfiguration) = preSolution
Debug = Debug
@@ -53,30 +33,10 @@ Global
{4D9FDFB5-986A-4139-823C-F4EE0ED481A1}.Debug.Build.0 = Debug|Win32
{4D9FDFB5-986A-4139-823C-F4EE0ED481A1}.Release.ActiveCfg = Release|Win32
{4D9FDFB5-986A-4139-823C-F4EE0ED481A1}.Release.Build.0 = Release|Win32
- {DF5FA93D-DC03-41A6-A18C-079198633450}.Debug.ActiveCfg = Debug|Win32
- {DF5FA93D-DC03-41A6-A18C-079198633450}.Debug.Build.0 = Debug|Win32
- {DF5FA93D-DC03-41A6-A18C-079198633450}.Release.ActiveCfg = Release|Win32
- {DF5FA93D-DC03-41A6-A18C-079198633450}.Release.Build.0 = Release|Win32
{24848551-EF4F-47E8-9A9D-EA4D49BC3ECA}.Debug.ActiveCfg = Debug|Win32
{24848551-EF4F-47E8-9A9D-EA4D49BC3ECA}.Debug.Build.0 = Debug|Win32
{24848551-EF4F-47E8-9A9D-EA4D49BC3ECA}.Release.ActiveCfg = Release|Win32
{24848551-EF4F-47E8-9A9D-EA4D49BC3ECA}.Release.Build.0 = Release|Win32
- {ABC5A7E8-072C-4A2D-B186-19EA5394B9C6}.Debug.ActiveCfg = Debug|Win32
- {ABC5A7E8-072C-4A2D-B186-19EA5394B9C6}.Debug.Build.0 = Debug|Win32
- {ABC5A7E8-072C-4A2D-B186-19EA5394B9C6}.Release.ActiveCfg = Release|Win32
- {ABC5A7E8-072C-4A2D-B186-19EA5394B9C6}.Release.Build.0 = Release|Win32
- {569C6F70-F41C-47F3-A622-8A88DC43D452}.Debug.ActiveCfg = Debug|Win32
- {569C6F70-F41C-47F3-A622-8A88DC43D452}.Debug.Build.0 = Debug|Win32
- {569C6F70-F41C-47F3-A622-8A88DC43D452}.Release.ActiveCfg = Release|Win32
- {569C6F70-F41C-47F3-A622-8A88DC43D452}.Release.Build.0 = Release|Win32
- {A4903F73-ED6C-4972-863E-F7355EB0145E}.Debug.ActiveCfg = Debug|Win32
- {A4903F73-ED6C-4972-863E-F7355EB0145E}.Debug.Build.0 = Debug|Win32
- {A4903F73-ED6C-4972-863E-F7355EB0145E}.Release.ActiveCfg = Release|Win32
- {A4903F73-ED6C-4972-863E-F7355EB0145E}.Release.Build.0 = Release|Win32
- {42B8A077-E162-4540-A688-246296ACAC1D}.Debug.ActiveCfg = Debug|Win32
- {42B8A077-E162-4540-A688-246296ACAC1D}.Debug.Build.0 = Debug|Win32
- {42B8A077-E162-4540-A688-246296ACAC1D}.Release.ActiveCfg = Release|Win32
- {42B8A077-E162-4540-A688-246296ACAC1D}.Release.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
EndGlobalSection
diff --git a/msvc/gtest.vcproj b/msvc/gtest.vcproj
index 14c9cfa..b3720b3 100644
--- a/msvc/gtest.vcproj
+++ b/msvc/gtest.vcproj
@@ -26,7 +26,7 @@
RuntimeLibrary="5"
UsePrecompiledHeader="0"
WarningLevel="3"
- Detect64BitPortabilityProblems="TRUE"
+ Detect64BitPortabilityProblems="FALSE"
DebugInformationFormat="4"/>
<Tool
Name="VCCustomBuildTool"/>
@@ -65,7 +65,7 @@
RuntimeLibrary="4"
UsePrecompiledHeader="0"
WarningLevel="3"
- Detect64BitPortabilityProblems="TRUE"
+ Detect64BitPortabilityProblems="FALSE"
DebugInformationFormat="3"/>
<Tool
Name="VCCustomBuildTool"/>
diff --git a/msvc/gtest_main-md.vcproj b/msvc/gtest_main-md.vcproj
index 9b8a1b6..5c7c933 100755
--- a/msvc/gtest_main-md.vcproj
+++ b/msvc/gtest_main-md.vcproj
@@ -26,7 +26,7 @@
RuntimeLibrary="3"
UsePrecompiledHeader="0"
WarningLevel="3"
- Detect64BitPortabilityProblems="TRUE"
+ Detect64BitPortabilityProblems="FALSE"
DebugInformationFormat="4"/>
<Tool
Name="VCCustomBuildTool"/>
@@ -65,7 +65,7 @@
RuntimeLibrary="2"
UsePrecompiledHeader="0"
WarningLevel="3"
- Detect64BitPortabilityProblems="TRUE"
+ Detect64BitPortabilityProblems="FALSE"
DebugInformationFormat="3"/>
<Tool
Name="VCCustomBuildTool"/>
diff --git a/msvc/gtest_main.vcproj b/msvc/gtest_main.vcproj
index 0f3a467..93e532d 100644
--- a/msvc/gtest_main.vcproj
+++ b/msvc/gtest_main.vcproj
@@ -26,7 +26,7 @@
RuntimeLibrary="5"
UsePrecompiledHeader="0"
WarningLevel="3"
- Detect64BitPortabilityProblems="TRUE"
+ Detect64BitPortabilityProblems="FALSE"
DebugInformationFormat="4"/>
<Tool
Name="VCCustomBuildTool"/>
@@ -65,7 +65,7 @@
RuntimeLibrary="4"
UsePrecompiledHeader="0"
WarningLevel="3"
- Detect64BitPortabilityProblems="TRUE"
+ Detect64BitPortabilityProblems="FALSE"
DebugInformationFormat="3"/>
<Tool
Name="VCCustomBuildTool"/>
diff --git a/msvc/gtest_prod_test-md.vcproj b/msvc/gtest_prod_test-md.vcproj
index b1dd135..bb912f4 100755
--- a/msvc/gtest_prod_test-md.vcproj
+++ b/msvc/gtest_prod_test-md.vcproj
@@ -25,7 +25,7 @@
RuntimeLibrary="3"
UsePrecompiledHeader="3"
WarningLevel="3"
- Detect64BitPortabilityProblems="TRUE"
+ Detect64BitPortabilityProblems="FALSE"
DebugInformationFormat="4"/>
<Tool
Name="VCCustomBuildTool"/>
@@ -70,7 +70,7 @@
RuntimeLibrary="2"
UsePrecompiledHeader="3"
WarningLevel="3"
- Detect64BitPortabilityProblems="TRUE"
+ Detect64BitPortabilityProblems="FALSE"
DebugInformationFormat="3"/>
<Tool
Name="VCCustomBuildTool"/>
diff --git a/msvc/gtest_prod_test.vcproj b/msvc/gtest_prod_test.vcproj
index 4ea07ff..336e8db 100644
--- a/msvc/gtest_prod_test.vcproj
+++ b/msvc/gtest_prod_test.vcproj
@@ -25,7 +25,7 @@
RuntimeLibrary="5"
UsePrecompiledHeader="3"
WarningLevel="3"
- Detect64BitPortabilityProblems="TRUE"
+ Detect64BitPortabilityProblems="FALSE"
DebugInformationFormat="4"/>
<Tool
Name="VCCustomBuildTool"/>
@@ -70,7 +70,7 @@
RuntimeLibrary="4"
UsePrecompiledHeader="3"
WarningLevel="3"
- Detect64BitPortabilityProblems="TRUE"
+ Detect64BitPortabilityProblems="FALSE"
DebugInformationFormat="3"/>
<Tool
Name="VCCustomBuildTool"/>
diff --git a/msvc/gtest_unittest-md.vcproj b/msvc/gtest_unittest-md.vcproj
index 238ef0c..6da35d1 100755
--- a/msvc/gtest_unittest-md.vcproj
+++ b/msvc/gtest_unittest-md.vcproj
@@ -25,7 +25,7 @@
RuntimeLibrary="3"
UsePrecompiledHeader="3"
WarningLevel="3"
- Detect64BitPortabilityProblems="TRUE"
+ Detect64BitPortabilityProblems="FALSE"
DebugInformationFormat="4"/>
<Tool
Name="VCCustomBuildTool"/>
@@ -70,7 +70,7 @@
RuntimeLibrary="2"
UsePrecompiledHeader="3"
WarningLevel="3"
- Detect64BitPortabilityProblems="TRUE"
+ Detect64BitPortabilityProblems="FALSE"
DebugInformationFormat="3"/>
<Tool
Name="VCCustomBuildTool"/>
diff --git a/msvc/gtest_unittest.vcproj b/msvc/gtest_unittest.vcproj
index 9dc4e07..58203e5 100644
--- a/msvc/gtest_unittest.vcproj
+++ b/msvc/gtest_unittest.vcproj
@@ -25,7 +25,7 @@
RuntimeLibrary="5"
UsePrecompiledHeader="3"
WarningLevel="3"
- Detect64BitPortabilityProblems="TRUE"
+ Detect64BitPortabilityProblems="FALSE"
DebugInformationFormat="4"/>
<Tool
Name="VCCustomBuildTool"/>
@@ -70,7 +70,7 @@
RuntimeLibrary="4"
UsePrecompiledHeader="3"
WarningLevel="3"
- Detect64BitPortabilityProblems="TRUE"
+ Detect64BitPortabilityProblems="FALSE"
DebugInformationFormat="3"/>
<Tool
Name="VCCustomBuildTool"/>
diff --git a/src/gtest.cc b/src/gtest.cc
index 1b602f5..677396d 100644
--- a/src/gtest.cc
+++ b/src/gtest.cc
@@ -3793,8 +3793,9 @@ int UnitTestImpl::RunAllTests() {
if (g_help_flag)
return 0;
- // TODO(vladl@google.com): Add a call to PostFlagParsingInit() here when
- // merging into the main branch.
+ // Repeats the call to the post-flag parsing initialization in case the
+ // user didn't call InitGoogleTest.
+ PostFlagParsingInit();
// Even if sharding is not on, test runners may want to use the
// GTEST_SHARD_STATUS_FILE to query whether the test supports the sharding
generated by cgit v0.12 at 2024-10-30 04:28:45 (GMT)