summaryrefslogtreecommitdiffstats
path: root/testing
diff options
context:
space:
mode:
Diffstat (limited to 'testing')
-rw-r--r--testing/gtest.gyp13
1 files changed, 1 insertions, 12 deletions
diff --git a/testing/gtest.gyp b/testing/gtest.gyp
index 88866a6..078ca3c 100644
--- a/testing/gtest.gyp
+++ b/testing/gtest.gyp
@@ -40,6 +40,7 @@
'gtest/src/gtest-internal-inl.h',
'gtest/src/gtest-port.cc',
'gtest/src/gtest.cc',
+ 'gtest/src/gtest_main.cc',
'multiprocess_func_list.cc',
'multiprocess_func_list.h',
'platform_test.h',
@@ -64,17 +65,5 @@
],
},
},
- {
- # Note that calling this "gtest_main" confuses the scons build,
- # which uses "_main" on files to produce special behavior.
- 'target_name': 'main',
- 'type': '<(library)',
- 'dependencies': [
- 'gtest',
- ],
- 'sources': [
- 'gtest/src/gtest_main.cc',
- ],
- },
],
}