Bug 866424 - Part b: Revert changes to shorten directory lengths because they broke importing; r=jhammel

--HG--
rename : dom/imptests/failures/html/html/dom/documents/dta/Makefile.in => dom/imptests/failures/html/html/dom/documents/dom-tree-accessors/Makefile.in
rename : dom/imptests/failures/html/html/dom/documents/dta/doc.gEBN/Makefile.in => dom/imptests/failures/html/html/dom/documents/dom-tree-accessors/document.getElementsByName/Makefile.in
rename : dom/imptests/failures/html/html/dom/documents/dta/doc.gEBN/moz.build => dom/imptests/failures/html/html/dom/documents/dom-tree-accessors/document.getElementsByName/moz.build
rename : dom/imptests/failures/html/html/dom/documents/dta/doc.gEBN/test_doc.gEBN-newelements.html.json => dom/imptests/failures/html/html/dom/documents/dom-tree-accessors/document.getElementsByName/test_document.getElementsByName-newelements.html.json
rename : dom/imptests/failures/html/html/dom/documents/dta/moz.build => dom/imptests/failures/html/html/dom/documents/dom-tree-accessors/moz.build
rename : dom/imptests/failures/html/html/dom/documents/dta/test_document.body-getter-frameset-and-body.html.json => dom/imptests/failures/html/html/dom/documents/dom-tree-accessors/test_document.body-getter-frameset-and-body.html.json
rename : dom/imptests/failures/html/html/dom/documents/dta/test_document.title-03.html.json => dom/imptests/failures/html/html/dom/documents/dom-tree-accessors/test_document.title-03.html.json
rename : dom/imptests/failures/html/html/dom/documents/dta/test_document.title-04.xhtml.json => dom/imptests/failures/html/html/dom/documents/dom-tree-accessors/test_document.title-04.xhtml.json
rename : dom/imptests/failures/html/html/dom/documents/dta/test_document.title-06.html.json => dom/imptests/failures/html/html/dom/documents/dom-tree-accessors/test_document.title-06.html.json
rename : dom/imptests/failures/html/html/dom/documents/dta/test_document.title-07.html.json => dom/imptests/failures/html/html/dom/documents/dom-tree-accessors/test_document.title-07.html.json
rename : dom/imptests/failures/html/html/obsolete/implreq/oeaaa/Makefile.in => dom/imptests/failures/html/html/obsolete/requirements-for-implementations/other-elements-attributes-and-apis/Makefile.in
rename : dom/imptests/failures/html/html/obsolete/implreq/oeaaa/moz.build => dom/imptests/failures/html/html/obsolete/requirements-for-implementations/other-elements-attributes-and-apis/moz.build
rename : dom/imptests/failures/html/html/obsolete/implreq/oeaaa/test_script-IDL-event-htmlfor.html.json => dom/imptests/failures/html/html/obsolete/requirements-for-implementations/other-elements-attributes-and-apis/test_script-IDL-event-htmlfor.html.json
rename : dom/imptests/html/html/dom/documents/dta/Makefile.in => dom/imptests/html/html/dom/documents/dom-tree-accessors/Makefile.in
rename : dom/imptests/html/html/dom/documents/dta/doc.gEBN/Makefile.in => dom/imptests/html/html/dom/documents/dom-tree-accessors/document.getElementsByName/Makefile.in
rename : dom/imptests/html/html/dom/documents/dta/doc.gEBN/moz.build => dom/imptests/html/html/dom/documents/dom-tree-accessors/document.getElementsByName/moz.build
rename : dom/imptests/html/html/dom/documents/dta/doc.gEBN/test_doc.gEBN-case.html => dom/imptests/html/html/dom/documents/dom-tree-accessors/document.getElementsByName/test_document.getElementsByName-case.html
rename : dom/imptests/html/html/dom/documents/dta/doc.gEBN/test_doc.gEBN-case.xhtml => dom/imptests/html/html/dom/documents/dom-tree-accessors/document.getElementsByName/test_document.getElementsByName-case.xhtml
rename : dom/imptests/html/html/dom/documents/dta/doc.gEBN/test_doc.gEBN-id.html => dom/imptests/html/html/dom/documents/dom-tree-accessors/document.getElementsByName/test_document.getElementsByName-id.html
rename : dom/imptests/html/html/dom/documents/dta/doc.gEBN/test_doc.gEBN-id.xhtml => dom/imptests/html/html/dom/documents/dom-tree-accessors/document.getElementsByName/test_document.getElementsByName-id.xhtml
rename : dom/imptests/html/html/dom/documents/dta/doc.gEBN/test_doc.gEBN-namespace.html => dom/imptests/html/html/dom/documents/dom-tree-accessors/document.getElementsByName/test_document.getElementsByName-namespace.html
rename : dom/imptests/html/html/dom/documents/dta/doc.gEBN/test_doc.gEBN-namespace.xhtml => dom/imptests/html/html/dom/documents/dom-tree-accessors/document.getElementsByName/test_document.getElementsByName-namespace.xhtml
rename : dom/imptests/html/html/dom/documents/dta/doc.gEBN/test_doc.gEBN-newelements.html => dom/imptests/html/html/dom/documents/dom-tree-accessors/document.getElementsByName/test_document.getElementsByName-newelements.html
rename : dom/imptests/html/html/dom/documents/dta/doc.gEBN/test_doc.gEBN-newelements.xhtml => dom/imptests/html/html/dom/documents/dom-tree-accessors/document.getElementsByName/test_document.getElementsByName-newelements.xhtml
rename : dom/imptests/html/html/dom/documents/dta/doc.gEBN/test_doc.gEBN-null-undef.html => dom/imptests/html/html/dom/documents/dom-tree-accessors/document.getElementsByName/test_document.getElementsByName-null-undef.html
rename : dom/imptests/html/html/dom/documents/dta/doc.gEBN/test_doc.gEBN-null-undef.xhtml => dom/imptests/html/html/dom/documents/dom-tree-accessors/document.getElementsByName/test_document.getElementsByName-null-undef.xhtml
rename : dom/imptests/html/html/dom/documents/dta/doc.gEBN/test_doc.gEBN-param.html => dom/imptests/html/html/dom/documents/dom-tree-accessors/document.getElementsByName/test_document.getElementsByName-param.html
rename : dom/imptests/html/html/dom/documents/dta/doc.gEBN/test_doc.gEBN-param.xhtml => dom/imptests/html/html/dom/documents/dom-tree-accessors/document.getElementsByName/test_document.getElementsByName-param.xhtml
rename : dom/imptests/html/html/dom/documents/dta/doc.gEBN/test_doc.gEBN-same.html => dom/imptests/html/html/dom/documents/dom-tree-accessors/document.getElementsByName/test_document.getElementsByName-same.html
rename : dom/imptests/html/html/dom/documents/dta/moz.build => dom/imptests/html/html/dom/documents/dom-tree-accessors/moz.build
rename : dom/imptests/html/html/dom/documents/dta/test_Document.getElementsByClassName-null-undef.html => dom/imptests/html/html/dom/documents/dom-tree-accessors/test_Document.getElementsByClassName-null-undef.html
rename : dom/imptests/html/html/dom/documents/dta/test_Element.getElementsByClassName-null-undef.html => dom/imptests/html/html/dom/documents/dom-tree-accessors/test_Element.getElementsByClassName-null-undef.html
rename : dom/imptests/html/html/dom/documents/dta/test_document.body-getter-body-and-frameset.html => dom/imptests/html/html/dom/documents/dom-tree-accessors/test_document.body-getter-body-and-frameset.html
rename : dom/imptests/html/html/dom/documents/dta/test_document.body-getter-foreign-frameset.html => dom/imptests/html/html/dom/documents/dom-tree-accessors/test_document.body-getter-foreign-frameset.html
rename : dom/imptests/html/html/dom/documents/dta/test_document.body-getter-frameset-and-body.html => dom/imptests/html/html/dom/documents/dom-tree-accessors/test_document.body-getter-frameset-and-body.html
rename : dom/imptests/html/html/dom/documents/dta/test_document.body-setter-01.html => dom/imptests/html/html/dom/documents/dom-tree-accessors/test_document.body-setter-01.html
rename : dom/imptests/html/html/dom/documents/dta/test_document.embeds-document.plugins-01.html => dom/imptests/html/html/dom/documents/dom-tree-accessors/test_document.embeds-document.plugins-01.html
rename : dom/imptests/html/html/dom/documents/dta/test_document.getElementsByClassName-same.html => dom/imptests/html/html/dom/documents/dom-tree-accessors/test_document.getElementsByClassName-same.html
rename : dom/imptests/html/html/dom/documents/dta/test_document.head-01.html => dom/imptests/html/html/dom/documents/dom-tree-accessors/test_document.head-01.html
rename : dom/imptests/html/html/dom/documents/dta/test_document.head-02.html => dom/imptests/html/html/dom/documents/dom-tree-accessors/test_document.head-02.html
rename : dom/imptests/html/html/dom/documents/dta/test_document.title-01.html => dom/imptests/html/html/dom/documents/dom-tree-accessors/test_document.title-01.html
rename : dom/imptests/html/html/dom/documents/dta/test_document.title-02.xhtml => dom/imptests/html/html/dom/documents/dom-tree-accessors/test_document.title-02.xhtml
rename : dom/imptests/html/html/dom/documents/dta/test_document.title-03.html => dom/imptests/html/html/dom/documents/dom-tree-accessors/test_document.title-03.html
rename : dom/imptests/html/html/dom/documents/dta/test_document.title-04.xhtml => dom/imptests/html/html/dom/documents/dom-tree-accessors/test_document.title-04.xhtml
rename : dom/imptests/html/html/dom/documents/dta/test_document.title-05.html => dom/imptests/html/html/dom/documents/dom-tree-accessors/test_document.title-05.html
rename : dom/imptests/html/html/dom/documents/dta/test_document.title-06.html => dom/imptests/html/html/dom/documents/dom-tree-accessors/test_document.title-06.html
rename : dom/imptests/html/html/dom/documents/dta/test_document.title-07.html => dom/imptests/html/html/dom/documents/dom-tree-accessors/test_document.title-07.html
rename : dom/imptests/html/html/dom/documents/dta/test_nameditem-01.html => dom/imptests/html/html/dom/documents/dom-tree-accessors/test_nameditem-01.html
rename : dom/imptests/html/html/obsolete/implreq/oeaaa/Makefile.in => dom/imptests/html/html/obsolete/requirements-for-implementations/other-elements-attributes-and-apis/Makefile.in
rename : dom/imptests/html/html/obsolete/implreq/oeaaa/moz.build => dom/imptests/html/html/obsolete/requirements-for-implementations/other-elements-attributes-and-apis/moz.build
rename : dom/imptests/html/html/obsolete/implreq/oeaaa/test_document-color-01.html => dom/imptests/html/html/obsolete/requirements-for-implementations/other-elements-attributes-and-apis/test_document-color-01.html
rename : dom/imptests/html/html/obsolete/implreq/oeaaa/test_document-color-02.html => dom/imptests/html/html/obsolete/requirements-for-implementations/other-elements-attributes-and-apis/test_document-color-02.html
rename : dom/imptests/html/html/obsolete/implreq/oeaaa/test_document-color-03.html => dom/imptests/html/html/obsolete/requirements-for-implementations/other-elements-attributes-and-apis/test_document-color-03.html
rename : dom/imptests/html/html/obsolete/implreq/oeaaa/test_document-color-04.html => dom/imptests/html/html/obsolete/requirements-for-implementations/other-elements-attributes-and-apis/test_document-color-04.html
rename : dom/imptests/html/html/obsolete/implreq/oeaaa/test_heading-obsolete-attributes-01.html => dom/imptests/html/html/obsolete/requirements-for-implementations/other-elements-attributes-and-apis/test_heading-obsolete-attributes-01.html
rename : dom/imptests/html/html/obsolete/implreq/oeaaa/test_script-IDL-event-htmlfor.html => dom/imptests/html/html/obsolete/requirements-for-implementations/other-elements-attributes-and-apis/test_script-IDL-event-htmlfor.html

dom/imptests/failures/html/html/dom/documents/dom-tree-accessors/document.getElementsByName/Makefile.in

@@ -10,7 +10,7 @@ relativesrcdir := @relativesrcdir@
 include $(DEPTH)/config/autoconf.mk
 
 MOCHITEST_FILES := \
-  test_doc.gEBN-newelements.html.json \
+  test_document.getElementsByName-newelements.html.json \
   $(NULL)
 
 include $(topsrcdir)/config/rules.mk

dom/imptests/html.mozbuild

@@ -4,10 +4,10 @@ DIRS += [
     'html/domxpath',
     'html/html/browsers/browsing-the-web/read-media',
     'html/html/browsers/the-window-object',
-    'html/html/dom/documents/dta',
+    'html/html/dom/documents/dom-tree-accessors',
     'html/html/dom/elements/global-attributes',
     'html/html/editing/the-hidden-attribute',
-    'html/html/obsolete/implreq/oeaaa',
+    'html/html/obsolete/requirements-for-implementations/other-elements-attributes-and-apis',
     'html/html/semantics/document-metadata/the-title-element',
     'html/html/semantics/forms/the-form-element',
     'html/html/semantics/forms/the-option-element',

dom/imptests/html.txt

@@ -2,10 +2,10 @@ git+ssh://git@github.com:w3c/web-platform-tests.git|html
 domxpath
 html/browsers/browsing-the-web/read-media
 html/browsers/the-window-object
-html/dom/documents/dta
+html/dom/documents/dom-tree-accessors
 html/dom/elements/global-attributes
 html/editing/the-hidden-attribute
-html/obsolete/implreq/oeaaa
+html/obsolete/requirements-for-implementations/other-elements-attributes-and-apis
 html/semantics/document-metadata/the-title-element
 html/semantics/forms/the-form-element
 html/semantics/forms/the-option-element

dom/imptests/html/html/dom/documents/dom-tree-accessors/document.getElementsByName/Makefile.in

@@ -0,0 +1,28 @@
+# THIS FILE IS AUTOGENERATED BY importTestsuite.py - DO NOT EDIT
+
+DEPTH := @DEPTH@
+
+topsrcdir := @top_srcdir@
+srcdir := @srcdir@
+VPATH := @srcdir@
+relativesrcdir := @relativesrcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+MOCHITEST_FILES := \
+  test_document.getElementsByName-case.html \
+  test_document.getElementsByName-case.xhtml \
+  test_document.getElementsByName-id.html \
+  test_document.getElementsByName-id.xhtml \
+  test_document.getElementsByName-namespace.html \
+  test_document.getElementsByName-namespace.xhtml \
+  test_document.getElementsByName-newelements.html \
+  test_document.getElementsByName-newelements.xhtml \
+  test_document.getElementsByName-null-undef.html \
+  test_document.getElementsByName-null-undef.xhtml \
+  test_document.getElementsByName-param.html \
+  test_document.getElementsByName-param.xhtml \
+  test_document.getElementsByName-same.html \
+  $(NULL)
+
+include $(topsrcdir)/config/rules.mk

dom/imptests/html/html/dom/documents/dom-tree-accessors/moz.build

@@ -1,5 +1,5 @@
 # THIS FILE IS AUTOGENERATED BY importTestsuite.py - DO NOT EDIT
 
 DIRS += [
-    'doc.gEBN',
+    'document.getElementsByName',
 ]

dom/imptests/html/html/dom/documents/dta/doc.gEBN/Makefile.in

@@ -1,28 +0,0 @@
-# THIS FILE IS AUTOGENERATED BY importTestsuite.py - DO NOT EDIT
-
-DEPTH := @DEPTH@
-
-topsrcdir := @top_srcdir@
-srcdir := @srcdir@
-VPATH := @srcdir@
-relativesrcdir := @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-MOCHITEST_FILES := \
-  test_doc.gEBN-case.html \
-  test_doc.gEBN-case.xhtml \
-  test_doc.gEBN-id.html \
-  test_doc.gEBN-id.xhtml \
-  test_doc.gEBN-namespace.html \
-  test_doc.gEBN-namespace.xhtml \
-  test_doc.gEBN-newelements.html \
-  test_doc.gEBN-newelements.xhtml \
-  test_doc.gEBN-null-undef.html \
-  test_doc.gEBN-null-undef.xhtml \
-  test_doc.gEBN-param.html \
-  test_doc.gEBN-param.xhtml \
-  test_doc.gEBN-same.html \
-  $(NULL)
-
-include $(topsrcdir)/config/rules.mk

dom/imptests/importTestsuite.py

@@ -55,17 +55,9 @@ def makePath(a, b):
         return a
     return "%s/%s" % (a, b)
 
-def shorten(path):
-    path = path.replace('dom-tree-accessors', 'dta')
-    path = path.replace('document.getElementsByName', 'doc.gEBN')
-    path = path.replace('requirements-for-implementations', 'implreq')
-    path = path.replace('other-elements-attributes-and-apis', 'oeaaa')
-    return path
-
 def copyTest(source, dest):
     """Copy the file at source to dest, as well as any ^headers^ file associated
     with it."""
-    dest = shorten(dest)
     shutil.copy(source, dest)
     if os.path.exists(source + HEADERS_SUFFIX):
         shutil.copy(source + HEADERS_SUFFIX, dest + HEADERS_SUFFIX)

dom/imptests/moz.build

@@ -8,10 +8,10 @@ DIRS += [
     'failures/editing/conformancetest',
     'failures/editing/selecttest',
     'failures/html/html/browsers/the-window-object',
-    'failures/html/html/dom/documents/dta',
-    'failures/html/html/dom/documents/dta/doc.gEBN',
+    'failures/html/html/dom/documents/dom-tree-accessors',
+    'failures/html/html/dom/documents/dom-tree-accessors/document.getElementsByName',
     'failures/html/html/dom/elements/global-attributes',
-    'failures/html/html/obsolete/implreq/oeaaa',
+    'failures/html/html/obsolete/requirements-for-implementations/other-elements-attributes-and-apis',
     'failures/html/html/semantics/forms/the-form-element',
     'failures/html/html/semantics/forms/the-option-element',
     'failures/html/html/semantics/forms/the-select-element',