Bump to gtest 1.10.0

[platform/upstream/gtest.git] / googletest / include / gtest / internal / custom / gtest-port.h

diff --git a/src/gtest_main.cc b/googletest/include/gtest/internal/custom/gtest-port.h
old mode 100755 (executable)
new mode 100644 (file)
similarity index 82%
rename from src/gtest_main.cc
rename to googletest/include/gtest/internal/custom/gtest-port.h
index f302822..cd85d95
--- a/src/gtest_main.cc
+++ b/googletest/include/gtest/internal/custom/gtest-port.h
@@ -1,4 +1,4 @@
-// Copyright 2006, Google Inc.
+// Copyright 2015, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -26,13 +26,12 @@
 // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+// Injection point for custom user configurations. See README for details
+//
+// ** Custom implementation starts here **
 
-#include <stdio.h>
-
-#include "gtest/gtest.h"
+#ifndef GTEST_INCLUDE_GTEST_INTERNAL_CUSTOM_GTEST_PORT_H_
+#define GTEST_INCLUDE_GTEST_INTERNAL_CUSTOM_GTEST_PORT_H_
 
-GTEST_API_ int main(int argc, char **argv) {
-  printf("Running main() from gtest_main.cc\n");
-  testing::InitGoogleTest(&argc, argv);
-  return RUN_ALL_TESTS();
-}
+#endif  // GTEST_INCLUDE_GTEST_INTERNAL_CUSTOM_GTEST_PORT_H_