unify googletest and googlemock main functionsrefs/pull/2596/head

2 files changed, 9 insertions, 4 deletions

diff --git a/googlemock/src/gmock_main.cc b/googlemock/src/gmock_main.cc
index 89c8183..d9e7170 100644
--- a/googlemock/src/gmock_main.cc
+++ b/googlemock/src/gmock_main.cc
@@ -55,7 +55,7 @@ GTEST_API_ int _tmain(int argc, TCHAR** argv) {
 #else
 GTEST_API_ int main(int argc, char** argv) {
 #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
   // also responsible for initializing Google Test.  Therefore there's
   // no need for calling testing::InitGoogleTest() separately.
diff --git a/googletest/src/gtest_main.cc b/googletest/src/gtest_main.cc
index 46b27c3..63b2cfd 100644
--- a/googletest/src/gtest_main.cc
+++ b/googletest/src/gtest_main.cc
@@ -27,7 +27,7 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-#include <cstdio>
+#include <iostream>
 #include "gtest/gtest.h"
 
 #if GTEST_OS_ESP8266 || GTEST_OS_ESP32
@@ -45,9 +45,14 @@ void loop() { RUN_ALL_TESTS(); }
 #endif
 
 #else
+#if __MSC_VER
+# include <tchar.h>  // NOLINT
 
-GTEST_API_ int main(int argc, char **argv) {
-  printf("Running main() from %s\n", __FILE__);
+GTEST_API_ int _tmain(int argc, TCHAR** argv) {
+#else
+GTEST_API_ int main(int argc, char** argv) {
+#endif  // __MSC_VER
+  std::cout << "Running main() from " << __FILE__ << '\n';
   testing::InitGoogleTest(&argc, argv);
   return RUN_ALL_TESTS();
 }