Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(338)

Side by Side Diff: Tools/Scripts/webkitpy/layout_tests/port/base.py

Issue 398543005: Revert of Modifications to layout test framework so that it can work with browser_tests. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | Tools/Scripts/webkitpy/layout_tests/port/browser_test.py » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (C) 2010 Google Inc. All rights reserved. 1 # Copyright (C) 2010 Google Inc. All rights reserved.
2 # 2 #
3 # Redistribution and use in source and binary forms, with or without 3 # Redistribution and use in source and binary forms, with or without
4 # modification, are permitted provided that the following conditions are 4 # modification, are permitted provided that the following conditions are
5 # met: 5 # met:
6 # 6 #
7 # * Redistributions of source code must retain the above copyright 7 # * Redistributions of source code must retain the above copyright
8 # notice, this list of conditions and the following disclaimer. 8 # notice, this list of conditions and the following disclaimer.
9 # * Redistributions in binary form must reproduce the above 9 # * Redistributions in binary form must reproduce the above
10 # copyright notice, this list of conditions and the following disclaimer 10 # copyright notice, this list of conditions and the following disclaimer
(...skipping 711 matching lines...) Expand 10 before | Expand all | Expand 10 after
722 return tests 722 return tests
723 723
724 def _real_tests(self, paths): 724 def _real_tests(self, paths):
725 # When collecting test cases, skip these directories 725 # When collecting test cases, skip these directories
726 skipped_directories = set(['.svn', '_svn', 'platform', 'resources', 'scr ipt-tests', 'reference', 'reftest']) 726 skipped_directories = set(['.svn', '_svn', 'platform', 'resources', 'scr ipt-tests', 'reference', 'reftest'])
727 files = find_files.find(self._filesystem, self.layout_tests_dir(), paths , skipped_directories, Port.is_test_file, self.test_key) 727 files = find_files.find(self._filesystem, self.layout_tests_dir(), paths , skipped_directories, Port.is_test_file, self.test_key)
728 return [self.relative_test_filename(f) for f in files] 728 return [self.relative_test_filename(f) for f in files]
729 729
730 # When collecting test cases, we include any file with these extensions. 730 # When collecting test cases, we include any file with these extensions.
731 _supported_file_extensions = set(['.html', '.xml', '.xhtml', '.xht', '.pl', 731 _supported_file_extensions = set(['.html', '.xml', '.xhtml', '.xht', '.pl',
732 '.htm', '.php', '.svg', '.mht', '.pdf']) 732 '.htm', '.php', '.svg', '.mht'])
733 733
734 @staticmethod 734 @staticmethod
735 # If any changes are made here be sure to update the isUsedInReftest method in old-run-webkit-tests as well. 735 # If any changes are made here be sure to update the isUsedInReftest method in old-run-webkit-tests as well.
736 def is_reference_html_file(filesystem, dirname, filename): 736 def is_reference_html_file(filesystem, dirname, filename):
737 if filename.startswith('ref-') or filename.startswith('notref-'): 737 if filename.startswith('ref-') or filename.startswith('notref-'):
738 return True 738 return True
739 filename_wihout_ext, unused = filesystem.splitext(filename) 739 filename_wihout_ext, unused = filesystem.splitext(filename)
740 for suffix in ['-expected', '-expected-mismatch', '-ref', '-notref']: 740 for suffix in ['-expected', '-expected-mismatch', '-ref', '-notref']:
741 if filename_wihout_ext.endswith(suffix): 741 if filename_wihout_ext.endswith(suffix):
742 return True 742 return True
(...skipping 1019 matching lines...) Expand 10 before | Expand all | Expand 10 after
1762 1762
1763 class PhysicalTestSuite(object): 1763 class PhysicalTestSuite(object):
1764 def __init__(self, base, args): 1764 def __init__(self, base, args):
1765 self.name = base 1765 self.name = base
1766 self.base = base 1766 self.base = base
1767 self.args = args 1767 self.args = args
1768 self.tests = set() 1768 self.tests = set()
1769 1769
1770 def __repr__(self): 1770 def __repr__(self):
1771 return "PhysicalTestSuite('%s', '%s', %s)" % (self.name, self.base, self .args) 1771 return "PhysicalTestSuite('%s', '%s', %s)" % (self.name, self.base, self .args)
OLDNEW
« no previous file with comments | « no previous file | Tools/Scripts/webkitpy/layout_tests/port/browser_test.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698