Remove testharness.js and friends in LayoutTests/http/tests/.

third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/servers/apache_http.py

 # Copyright (C) 2011 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 42 matching lines @@
 
         self._pid_file = self._filesystem.join(self._runtime_path, '%s.pid' % self._name)
 
         executable = self._port_obj.path_to_apache()
         server_root = self._filesystem.dirname(self._filesystem.dirname(executable))
 
         test_dir = self._port_obj.layout_tests_dir()
         document_root = self._filesystem.join(test_dir, "http", "tests")
         js_test_resources_dir = self._filesystem.join(test_dir, "resources")
         forms_test_resources_dir = self._filesystem.join(test_dir, "fast", "forms", "resources")
+        imported_resources_dir = self._filesystem.join(test_dir, "imported", "web-platform-tests", "resources")
         media_resources_dir = self._filesystem.join(test_dir, "media")
         mime_types_path = self._filesystem.join(test_dir, "http", "conf", "mime.types")
         cert_file = self._filesystem.join(test_dir, "http", "conf", "webkit-httpd.pem")
         inspector_sources_dir = self._port_obj.inspector_build_directory()
 
         self._access_log_path = self._filesystem.join(output_dir, "access_log.txt")
         self._error_log_path = self._filesystem.join(output_dir, "error_log.txt")
 
         self._is_win = self._port_obj.host.platform.is_win()
 
         start_cmd = [
             executable,
             '-f', '%s' % self._port_obj.path_to_apache_config_file(),
             '-C', 'ServerRoot "%s"' % server_root,
             '-C', 'DocumentRoot "%s"' % document_root,
             '-c', 'Alias /js-test-resources "%s"' % js_test_resources_dir,
+            '-c', 'AliasMatch ^/resources/testharness([r.].*) "%s/testharness$1"' % imported_resources_dir,
+            '-c', 'Alias /w3c/resources/WebIDLParser.js "%s/webidl2/lib/webidl2.js"' % imported_resources_dir,

[jsbell, 2016/04/18 17:39:46]

WebIDLParser.js is automagically made available here.

[Dirk Pranke, 2016/04/18 17:44:31]

Ah, right.

+            '-c', 'Alias /w3c/resources "%s"' % imported_resources_dir,
             '-c', 'Alias /forms-test-resources "%s"' % forms_test_resources_dir,
             '-c', 'Alias /media-resources "%s"' % media_resources_dir,
             '-c', 'TypesConfig "%s"' % mime_types_path,
             '-c', 'CustomLog "%s" common' % self._access_log_path,
             '-c', 'ErrorLog "%s"' % self._error_log_path,
             '-c', 'PidFile %s' % self._pid_file,
             '-c', 'SSLCertificateFile "%s"' % cert_file,
             '-c', 'Alias /inspector-sources "%s"' % inspector_sources_dir,
         ]
 
@@ skipping 78 matching lines @@
         retval = proc.returncode
         err = proc.stderr.read()
         if retval or len(err):
             raise server_base.ServerError('Failed to stop %s: %s' % (self._name, err))
 
         # For some reason apache isn't guaranteed to have actually stopped after
         # the stop command returns, so we wait a little while longer for the
         # pid file to be removed.
         if not self._wait_for_action(lambda: not self._filesystem.exists(self._pid_file)):
             raise server_base.ServerError('Failed to stop %s: pid file still exists' % self._name)