gitMirror/googletest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #2596 from kuzkry:remove-workaround_msvc-wmain-link-error

Browse Source 
PiperOrigin-RevId: 282589492
This commit is contained in:
Gennadiy Rozental 2019-11-26 15:47:30 -05:00
commit 0361bdf591
2 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
googlemock/src/gmock_main.cc
View File

@ -48,21 +48,14 @@ void loop() { RUN_ALL_TESTS(); }
#endif #endif
#else #else
#if __MSC_VER
// MS C++ compiler/linker has a bug on Windows (not on Windows CE), which
// causes a link error when _tmain is defined in a static library and UNICODE
// is enabled. For this reason instead of _tmain, main function is used on
// Windows. See the following link to track the current status of this bug:
// https://web.archive.org/web/20170912203238/connect.microsoft.com/VisualStudio/feedback/details/394464/wmain-link-error-in-the-static-library
// // NOLINT
#if GTEST_OS_WINDOWS_MOBILE
# include <tchar.h> // NOLINT # include <tchar.h> // NOLINT
GTEST_API_ int _tmain(int argc, TCHAR** argv) { GTEST_API_ int _tmain(int argc, TCHAR** argv) {
#else #else
GTEST_API_ int main(int argc, char** argv) { GTEST_API_ int main(int argc, char** argv) {
#endif // GTEST_OS_WINDOWS_MOBILE #endif // __MSC_VER
std::cout << "Running main() from gmock_main.cc\n"; std::cout << "Running main() from " << __FILE__ << '\n';
// Since Google Mock depends on Google Test, InitGoogleMock() is // Since Google Mock depends on Google Test, InitGoogleMock() is
// also responsible for initializing Google Test. Therefore there's // also responsible for initializing Google Test. Therefore there's
// no need for calling testing::InitGoogleTest() separately. // no need for calling testing::InitGoogleTest() separately.

11
googletest/src/gtest_main.cc
View File

@ -27,7 +27,7 @@
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include <cstdio> #include <iostream>
#include "gtest/gtest.h" #include "gtest/gtest.h"
#if GTEST_OS_ESP8266 || GTEST_OS_ESP32 #if GTEST_OS_ESP8266 || GTEST_OS_ESP32
@ -45,9 +45,14 @@ void loop() { RUN_ALL_TESTS(); }
#endif #endif
#else #else
#if __MSC_VER
# include <tchar.h> // NOLINT
GTEST_API_ int main(int argc, char **argv) { GTEST_API_ int _tmain(int argc, TCHAR** argv) {
printf("Running main() from %s\n", __FILE__); #else
GTEST_API_ int main(int argc, char** argv) {
#endif // __MSC_VER
std::cout << "Running main() from " << __FILE__ << '\n';
testing::InitGoogleTest(&argc, argv); testing::InitGoogleTest(&argc, argv);
return RUN_ALL_TESTS(); return RUN_ALL_TESTS();
} }