old_contents: #!/usr/bin/env python
  
  # A small utility to take the output of a Swift validation test run
  # where some compiler crashers have been fixed, and move them into the
  # "fixed" testsuite, removing the "--crash" in the process.
  
  import os
  import re
  import sys
  
  
  def execute_cmd(cmd):
      print(cmd)
      os.system(cmd)
  
  # The regular expression we use to match compiler-crasher lines.
  regex = re.compile(
      '.*Swift :: '
      '(compiler_crashers|compiler_crashers_2|IDE/crashers)/(.*\.swift).*')
  
  # Take the output of lit as standard input.
  for line in sys.stdin:
      match = regex.match(line)
      if match:
          suffix = match.group(1)
          filename = match.group(2)
  
          # Move the test over to the fixed suite.
          from_filename = 'validation-test/%s/%s' % (suffix, filename)
          to_filename = 'validation-test/%s_fixed/%s' % (suffix, filename)
          git_mv_cmd = 'git mv %s %s' % (from_filename, to_filename)
          execute_cmd(git_mv_cmd)
  
          # Replace "not --crash" with "not", and remove XFAIL lines.
          sed_replace_not_cmd = 'sed -e "s/not --crash/not/" -i "" %s' % (
              to_filename)
          execute_cmd(sed_replace_not_cmd)
  
          # Remove "// XFAIL: whatever" lines.
          sed_remove_xfail_cmd = 'sed -e "s/^\\/\\/.*XFAIL.*$//g" -i "" %s' % (
              to_filename)
          execute_cmd(sed_remove_xfail_cmd)
  
          # "git add" the result.
          git_add_cmd = 'git add %s' % (to_filename)
          execute_cmd(git_add_cmd)
  
new_contents: #!/usr/bin/env python
  
  # A small utility to take the output of a Swift validation test run
  # where some compiler crashers have been fixed, and move them into the
  # "fixed" testsuite, removing the "--crash" in the process.
  
  import os
  import re
  import sys
  
  
  def execute_cmd(cmd):
      print(cmd)
      os.system(cmd)
  
  # The regular expression we use to match compiler-crasher lines.
  regex = re.compile(
      '.*Swift(.*) :: '
      '(compiler_crashers|compiler_crashers_2|IDE/crashers)/(.*\.swift).*')
  
  # Take the output of lit as standard input.
  for line in sys.stdin:
      match = regex.match(line)
      if match:
          suffix = match.group(2)
          filename = match.group(3)
  
          # Move the test over to the fixed suite.
          from_filename = 'validation-test/%s/%s' % (suffix, filename)
          to_filename = 'validation-test/%s_fixed/%s' % (suffix, filename)
          git_mv_cmd = 'git mv %s %s' % (from_filename, to_filename)
          execute_cmd(git_mv_cmd)
  
          # Replace "not --crash" with "not", and remove XFAIL lines.
          sed_replace_not_cmd = 'sed -e "s/not --crash/not/" -i "" %s' % (
              to_filename)
          execute_cmd(sed_replace_not_cmd)
  
          # Remove "// XFAIL: whatever" lines.
          sed_remove_xfail_cmd = 'sed -e "s/^\\/\\/.*XFAIL.*$//g" -i "" %s' % (
              to_filename)
          execute_cmd(sed_remove_xfail_cmd)
  
          # "git add" the result.
          git_add_cmd = 'git add %s' % (to_filename)
          execute_cmd(git_add_cmd)
  
subject: Fix resolve-crashes.py for recent change