Use Port.skips_test in copy-existing-baselines command.

third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/base.py

 # Copyright (C) 2010 Google Inc. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are
 # met:
 #
 #     * Redistributions of source code must retain the above copyright
 # notice, this list of conditions and the following disclaimer.
 #     * Redistributions in binary form must reproduce the above
 # copyright notice, this list of conditions and the following disclaimer
@@ skipping 912 matching lines @@
         return self._webkit_finder.perf_tests_dir()
 
     def skipped_layout_tests(self, test_list):
         """Returns tests skipped outside of the TestExpectations files."""
         return set(self._skipped_tests_for_unsupported_features(test_list))
 
     def skips_test(self, test, generic_expectations, full_expectations):
         """Checks whether the given test is skipped for this port.
 
         This should return True if the test is skipped because the port
-        runs smoke tests only, or because there's a skip test expectation line.
+        runs smoke tests only, or because the

[chenwilliam, 2016/10/31 22:49:29]

I think this patch truncated the comment on accident (I just noticed it while
working on this file).

[qyearsley, 2016/10/31 23:05:21]

Good catch, thanks! I'll fix this in a follow-up.

         """
         fs = self.host.filesystem
         if self.default_smoke_test_only():
             smoke_test_filename = fs.join(self.layout_tests_dir(), 'SmokeTests')
             if fs.exists(smoke_test_filename) and test not in fs.read_text_file(smoke_test_filename):
                 return True
 
+        # In general, Skip lines in the generic expectations file indicate
+        # that the test is temporarily skipped, whereas if the test is skipped
+        # in another file (e.g. WontFix in NeverFixTests), then the test may
+        # always be skipped for this port.
+        # TODO(qyearsley): Simplify this so that it doesn't rely on having
+        # two copies of the test expectations.
         return (SKIP in full_expectations.get_expectations(test) and
                 SKIP not in generic_expectations.get_expectations(test))
 
     def _tests_from_skipped_file_contents(self, skipped_file_contents):
         tests_to_skip = []
         for line in skipped_file_contents.split('\n'):
             line = line.strip()
             line = line.rstrip('/')  # Best to normalize directory names to not include the trailing slash.
             if line.startswith('#') or not len(line):
                 continue
@@ skipping 887 matching lines @@
 
     def __init__(self, base, args, reference_args=None):
         self.name = base
         self.base = base
         self.args = args
         self.reference_args = args if reference_args is None else reference_args
         self.tests = set()
 
     def __repr__(self):
         return "PhysicalTestSuite('%s', '%s', %s, %s)" % (self.name, self.base, self.args, self.reference_args)