Пример #1
0
 def test_extract_comment(self):
   self.assertEquals(
       '# Foo\n# Bar\n',
       merge_isolate.extract_comment('# Foo\n# Bar\n{}'))
   self.assertEquals(
       '',
       merge_isolate.extract_comment('{}'))
Пример #2
0
def CMDmerge(args):
  """Reads and merges the data from the trace back into the original .isolate.

  Ignores --outdir.
  """
  parser = OptionParserIsolate(command='merge', require_result=False)
  options, _ = parser.parse_args(args)
  complete_state = load_complete_state(options, NO_INFO)
  value = read(complete_state)

  # Now take that data and union it into the original .isolate file.
  with open(complete_state.saved_state.isolate_file, 'r') as f:
    prev_content = f.read()
  prev_config = merge_isolate.load_gyp(
      merge_isolate.eval_content(prev_content),
      merge_isolate.extract_comment(prev_content),
      merge_isolate.DEFAULT_OSES)
  new_config = merge_isolate.load_gyp(
      value,
      '',
      merge_isolate.DEFAULT_OSES)
  config = merge_isolate.union(prev_config, new_config)
  # pylint: disable=E1103
  data = merge_isolate.convert_map_to_gyp(
      *merge_isolate.reduce_inputs(*merge_isolate.invert_map(config.flatten())))
  print 'Updating %s' % complete_state.saved_state.isolate_file
  with open(complete_state.saved_state.isolate_file, 'wb') as f:
    merge_isolate.print_all(config.file_comment, data, f)

  return 0
Пример #3
0
 def test_extract_comment(self):
     self.assertEquals('# Foo\n# Bar\n',
                       merge_isolate.extract_comment('# Foo\n# Bar\n{}'))
     self.assertEquals('', merge_isolate.extract_comment('{}'))