Bug 1170431 - Pass buildid as input to pycert.py. r=gps

This commit is contained in:
Mike Hommey 2015-06-02 15:28:51 +09:00
parent 1d1000b55e
commit 19e738456b
2 changed files with 2 additions and 6 deletions

View File

@ -381,12 +381,8 @@ class Certificate:
# particularly important when building on OS X, where we generate
# everything twice for unified builds. During the unification step, if
# any pair of input files differ, the build system throws an error.
# While it would make the most sense to provide the path to the buildid
# file itself, since it doesn't exist when processing moz.build files
# (but it does exist when actually running this script), the build
# system won't let us pass it in directly.
def main(output, inputPath, buildIDPath):
with open('%s/buildid' % buildIDPath) as buildidFile:
with open(buildIDPath) as buildidFile:
buildid = buildidFile.read().strip()
now = datetime.datetime.strptime(buildid, '%Y%m%d%H%M%S')
with open(inputPath) as configStream:

View File

@ -35,5 +35,5 @@ for test_certificate in test_certificates:
GENERATED_FILES += [test_certificate]
props = GENERATED_FILES[test_certificate]
props.script = '../pycert.py'
props.inputs = [input_file, '!/config']
props.inputs = [input_file, '!/config/buildid']
TEST_HARNESS_FILES.xpcshell.security.manager.ssl.tests.unit.test_intermediate_basic_usage_constraints += ['!%s' % test_certificate]