Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
yangql
googletest
Commits
a909becd
Commit
a909becd
authored
Nov 17, 2019
by
Krystian Kuzniarek
Browse files
unify googletest and googlemock main functions
parent
298a40f0
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
4 deletions
+9
-4
googlemock/src/gmock_main.cc
googlemock/src/gmock_main.cc
+1
-1
googletest/src/gtest_main.cc
googletest/src/gtest_main.cc
+8
-3
No files found.
googlemock/src/gmock_main.cc
View file @
a909becd
...
...
@@ -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.
...
...
googletest/src/gtest_main.cc
View file @
a909becd
...
...
@@ -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
();
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment