buildbot_spec.py: Include dm_flags and nanobench_flags

tools/buildbot_spec.py

 #
 # Copyright 2015 Google Inc.
 #
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 #
 
 #!/usr/bin/env python
 
 usage = '''
 Write buildbot spec to outfile based on the bot name:
   $ python buildbot_spec.py outfile Test-Ubuntu-GCC-GCE-CPU-AVX2-x86-Debug
 Or run self-tests:
   $ python buildbot_spec.py test
 '''
 
 import inspect
 import json
 import os
 import sys
 
 import builder_name_schema
+import dm_flags
+import nanobench_flags
 
 
 def lineno():
   caller = inspect.stack()[1]  # Up one level to our caller.
   return inspect.getframeinfo(caller[0]).lineno
 
 # Since we don't actually start coverage until we're in the self-test,
 # some function def lines aren't reported as covered. Add them to this
 # list so that we can ignore them.
 cov_skip = []
@@ skipping 183 matching lines @@
 def get_builder_spec(builder_name):
   builder_dict = builder_name_schema.DictForBuilderName(builder_name)
   env = get_extra_env_vars(builder_dict)
   gyp_defs = gyp_defines(builder_dict)
   gyp_defs_list = ['%s=%s' % (k, v) for k, v in gyp_defs.iteritems()]
   gyp_defs_list.sort()
   env['GYP_DEFINES'] = ' '.join(gyp_defs_list)
   rv = {
     'build_targets': build_targets_from_builder_dict(builder_dict),
     'builder_cfg': builder_dict,
+    'dm_flags': dm_flags.get_args(builder_name),
     'env': env,
+    'nanobench_flags': nanobench_flags.get_args(builder_name),
   }
   device = device_cfg(builder_dict)
   if device:
     rv['device_cfg'] = device
   return rv
 
 
 cov_end = lineno()   # Don't care about code coverage past here.
 
 
@@ skipping 46 matching lines @@
   if len(sys.argv) == 2 and sys.argv[1] == 'test':
     self_test()
     sys.exit(0)
 
   if len(sys.argv) != 3:
     print usage
     sys.exit(1)
 
   with open(sys.argv[1], 'w') as out:
     json.dump(get_builder_spec(sys.argv[2]), out)