summaryrefslogtreecommitdiffstats
path: root/googletest/src
diff options
context:
space:
mode:
authorKrystian Kuzniarek <krystian.kuzniarek@gmail.com>2019-11-27 14:00:52 (GMT)
committerKrystian Kuzniarek <krystian.kuzniarek@gmail.com>2019-11-27 14:00:52 (GMT)
commit967d8e05c2f006dc0bcebb3b0b28ecc637204b8d (patch)
tree01a10874d141d944491d3ddba0dfebaaad030bc8 /googletest/src
parent34e92be31cf457ad4054b7908ee5e0e214dbcddc (diff)
downloadgoogletest-967d8e05c2f006dc0bcebb3b0b28ecc637204b8d.zip
googletest-967d8e05c2f006dc0bcebb3b0b28ecc637204b8d.tar.gz
googletest-967d8e05c2f006dc0bcebb3b0b28ecc637204b8d.tar.bz2
Revert "unify googletest and googlemock main functions"
This reverts commit a909becdc599c46bcb57346b6123cb57cd07d15d.
Diffstat (limited to 'googletest/src')
-rw-r--r--googletest/src/gtest_main.cc11
1 files changed, 3 insertions, 8 deletions
diff --git a/googletest/src/gtest_main.cc b/googletest/src/gtest_main.cc
index 63b2cfd..46b27c3 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 <iostream>
+#include <cstdio>
#include "gtest/gtest.h"
#if GTEST_OS_ESP8266 || GTEST_OS_ESP32
@@ -45,14 +45,9 @@ void loop() { RUN_ALL_TESTS(); }
#endif
#else
-#if __MSC_VER
-# include <tchar.h> // NOLINT
-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';
+GTEST_API_ int main(int argc, char **argv) {
+ printf("Running main() from %s\n", __FILE__);
testing::InitGoogleTest(&argc, argv);
return RUN_ALL_TESTS();
}