W3C test_importer.py includes 'support' and exclude 'tools' directories

Tools/Scripts/webkitpy/w3c/test_importer.py

 # Copyright (C) 2013 Adobe Systems Incorporated. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
 # are met:
 #
 # 1. Redistributions of source code must retain the above
 #    copyright notice, this list of conditions and the following
 #    disclaimer.
 # 2. Redistributions in binary form must reproduce the above
@@ skipping 178 matching lines @@
         # FIXME: use filesystem
         paths_to_skip = self.find_paths_to_skip()
 
         for root, dirs, files in os.walk(directory):
             cur_dir = root.replace(self.dir_above_repo + '/', '') + '/'
             _log.info('  scanning ' + cur_dir + '...')
             total_tests = 0
             reftests = 0
             jstests = 0
 
-            DIRS_TO_SKIP = ('.git', '.hg', 'test-plan')
+            # Files in 'tools' are not for browser testing (e.g., a script for generating test files).
+            # http://testthewebforward.org/docs/test-format-guidelines.html#tools
+            DIRS_TO_SKIP = ('.git', '.hg', 'test-plan', 'tools')
+
+            # Need to copy all files in 'support', including HTML without meta data.
+            # http://testthewebforward.org/docs/test-format-guidelines.html#support-files
+            DIRS_TO_INCLUDE = ('resources', 'support')
+
             if dirs:
                 for d in DIRS_TO_SKIP:
                     if d in dirs:
                         dirs.remove(d)
 
                 for path in paths_to_skip:
                     path_base = path.replace(self.options.destination + '/', '')
                     path_base = path_base.replace(cur_dir, '')
                     path_full = self.filesystem.join(root, path_base)
                     if path_base in dirs:
@@ skipping 23 matching lines @@
                 if filename.startswith('.') or filename.endswith('.pl'):
                     continue  # For some reason the w3c repo contains random perl scripts we don't care about.
 
                 fullpath = os.path.join(root, filename)
 
                 mimetype = mimetypes.guess_type(fullpath)
                 if not 'html' in str(mimetype[0]) and not 'application/xhtml+xml' in str(mimetype[0]) and not 'application/xml' in str(mimetype[0]):
                     copy_list.append({'src': fullpath, 'dest': filename})
                     continue
 
-                if root.endswith('resources'):
+                if os.path.basename(root) in DIRS_TO_INCLUDE:
                     copy_list.append({'src': fullpath, 'dest': filename})
                     continue
 
                 test_parser = TestParser(vars(self.options), filename=fullpath)
                 test_info = test_parser.analyze_test()
                 if test_info is None:
                     continue
 
                 if 'reference' in test_info.keys():
                     reftests += 1
@@ skipping 146 matching lines @@
         """ Creates a destination directory that mirrors that of the source directory """
 
         new_subpath = self.dir_to_import[len(self.top_of_repo):]
 
         destination_directory = os.path.join(self.destination_directory, new_subpath)
 
         if not os.path.exists(destination_directory):
             os.makedirs(destination_directory)
 
         _log.info('Tests will be imported into: %s', destination_directory)