summaryrefslogtreecommitdiffstats
path: root/security/nss/gtests/google_test
diff options
context:
space:
mode:
authorwolfbeast <mcwerewolf@gmail.com>2018-02-06 11:46:26 +0100
committerwolfbeast <mcwerewolf@gmail.com>2018-02-06 11:46:26 +0100
commitf017b749ea9f1586d2308504553d40bf4cc5439d (patch)
treec6033924a0de9be1ab140596e305898c651bf57e /security/nss/gtests/google_test
parent7c728b3c7680662fc4e92b5d03697b8339560b08 (diff)
downloadUXP-f017b749ea9f1586d2308504553d40bf4cc5439d.tar
UXP-f017b749ea9f1586d2308504553d40bf4cc5439d.tar.gz
UXP-f017b749ea9f1586d2308504553d40bf4cc5439d.tar.lz
UXP-f017b749ea9f1586d2308504553d40bf4cc5439d.tar.xz
UXP-f017b749ea9f1586d2308504553d40bf4cc5439d.zip
Update NSS to 3.32.1-RTM
Diffstat (limited to 'security/nss/gtests/google_test')
-rw-r--r--security/nss/gtests/google_test/google_test.gyp33
-rwxr-xr-xsecurity/nss/gtests/google_test/gtest/test/gtest_xml_output_unittest.py2
2 files changed, 1 insertions, 34 deletions
diff --git a/security/nss/gtests/google_test/google_test.gyp b/security/nss/gtests/google_test/google_test.gyp
index e309ba25a..b3a11b7af 100644
--- a/security/nss/gtests/google_test/google_test.gyp
+++ b/security/nss/gtests/google_test/google_test.gyp
@@ -13,43 +13,10 @@
'sources': [
'gtest/src/gtest-all.cc'
],
- 'dependencies': [
- '<(DEPTH)/lib/nss/nss.gyp:nss3',
- '<(DEPTH)/lib/util/util.gyp:nssutil3',
- '<(DEPTH)/lib/smime/smime.gyp:smime3',
- '<(DEPTH)/lib/ssl/ssl.gyp:ssl3',
- '<(DEPTH)/cmd/lib/lib.gyp:sectool'
- ]
},
- {
- 'target_name': 'gtest1',
- 'type': 'shared_library',
- 'dependencies': [
- 'gtest'
- ],
- # Work around a gyp bug. Fixed upstream in gyp:
- # https://chromium.googlesource.com/external/gyp/+/93cc6e2c23e4d5ebd179f388e67aa907d0dfd43d
- 'conditions': [
- ['OS!="win"', {
- 'libraries': [
- '-lstdc++',
- ],
- }],
- ],
- # For some reason when just linking static libraries into
- # a DLL the link fails without this.
- 'msvs_settings': {
- 'VCLinkerTool': {
- 'AdditionalDependencies': [
- '/DEFAULTLIB:MSVCRT',
- ],
- },
- },
- }
],
'target_defaults': {
'include_dirs': [
- 'gtest/include/',
'gtest'
],
},
diff --git a/security/nss/gtests/google_test/gtest/test/gtest_xml_output_unittest.py b/security/nss/gtests/google_test/gtest/test/gtest_xml_output_unittest.py
index 467ab1d08..f605d4ee2 100755
--- a/security/nss/gtests/google_test/gtest/test/gtest_xml_output_unittest.py
+++ b/security/nss/gtests/google_test/gtest/test/gtest_xml_output_unittest.py
@@ -192,7 +192,7 @@ class GTestXMLOutputUnitTest(gtest_xml_test_utils.GTestXMLTestCase):
day=int(match.group(3)), hour=int(match.group(4)),
minute=int(match.group(5)), second=int(match.group(6)))
- time_delta = abs(datetime.datetime.utcnow() - date_time_from_xml)
+ time_delta = abs(datetime.datetime.now() - date_time_from_xml)
# timestamp value should be near the current local time
self.assertTrue(time_delta < datetime.timedelta(seconds=600),
'time_delta is %s' % time_delta)