Bug 924523 - Part a: use mochitest manifests in dom/tests/mochitest/ajax/jquery; r=jst
authorMs2ger <ms2ger@gmail.com>
Thu, 28 Nov 2013 15:07:54 +0100
changeset 157985 995adfd14ecd9191e2578d323b01a678430aadd8
parent 157984 2c3e39ca0950cf029e14f52cd0695d0070306db5
child 157986 8d5db94228500c3b8b295d07ec94520b0a20de6c
push id25730
push userMs2ger@gmail.com
push dateFri, 29 Nov 2013 07:40:20 +0000
treeherdermozilla-central@733f30f7093b [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjst
bugs924523
milestone28.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 924523 - Part a: use mochitest manifests in dom/tests/mochitest/ajax/jquery; r=jst
dom/tests/mochitest/ajax/jquery/dist/Makefile.in
dom/tests/mochitest/ajax/jquery/dist/moz.build
dom/tests/mochitest/ajax/jquery/mochitest.ini
dom/tests/mochitest/ajax/jquery/moz.build
dom/tests/mochitest/ajax/jquery/test/Makefile.in
dom/tests/mochitest/ajax/jquery/test/data/Makefile.in
dom/tests/mochitest/ajax/jquery/test/data/moz.build
dom/tests/mochitest/ajax/jquery/test/data/offset/Makefile.in
dom/tests/mochitest/ajax/jquery/test/data/offset/moz.build
dom/tests/mochitest/ajax/jquery/test/moz.build
dom/tests/mochitest/ajax/jquery/test/unit/Makefile.in
dom/tests/mochitest/ajax/jquery/test/unit/moz.build
dom/tests/mochitest/ajax/moz.build
deleted file mode 100644
--- a/dom/tests/mochitest/ajax/jquery/dist/Makefile.in
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-MOCHITEST_FILES	= \
-	jquery.js \
-	$(NULL)
deleted file mode 100644
--- a/dom/tests/mochitest/ajax/jquery/dist/moz.build
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
--- a/dom/tests/mochitest/ajax/jquery/mochitest.ini
+++ b/dom/tests/mochitest/ajax/jquery/mochitest.ini
@@ -1,4 +1,36 @@
 [DEFAULT]
-support-files = manifest.json
+support-files =
+  manifest.json
+  dist/jquery.js
+  test/index.html
+  test/offset.html
+  test/test.js
+  test/fix.html
+  test/data/cow.jpg
+  test/data/dashboard.xml
+  test/data/iframe.html
+  test/data/json_assigned_obj.js
+  test/data/json_obj.js
+  test/data/name.html
+  test/data/test.html
+  test/data/test.js
+  test/data/test2.html
+  test/data/test3.html
+  test/data/testrunner.js
+  test/data/testsuite.css
+  test/data/with_fries.xml
+  test/data/offset/absolute.html
+  test/data/offset/fixed.html
+  test/data/offset/relative.html
+  test/data/offset/scroll.html
+  test/data/offset/static.html
+  test/data/offset/table.html
+  test/unit/ajax.js
+  test/unit/core.js
+  test/unit/dimensions.js
+  test/unit/event.js
+  test/unit/fx.js
+  test/unit/offset.js
+  test/unit/selector.js
 
 [test_jQuery.html]
deleted file mode 100644
--- a/dom/tests/mochitest/ajax/jquery/moz.build
+++ /dev/null
@@ -1,10 +0,0 @@
-# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-DIRS += ['dist', 'test']
-
-MOCHITEST_MANIFESTS += ['mochitest.ini']
-
deleted file mode 100644
--- a/dom/tests/mochitest/ajax/jquery/test/Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-MOCHITEST_FILES	= \
-	index.html \
-	offset.html \
-	test.js \
-	fix.html \
-	$(NULL)
deleted file mode 100644
--- a/dom/tests/mochitest/ajax/jquery/test/data/Makefile.in
+++ /dev/null
@@ -1,20 +0,0 @@
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-MOCHITEST_FILES	= \
-	cow.jpg \
-	dashboard.xml \
-	iframe.html \
-	json_assigned_obj.js \
-	json_obj.js \
-	name.html \
-	test.html \
-	test.js \
-	test2.html \
-	test3.html \
-	testrunner.js \
-	testsuite.css \
-	with_fries.xml \
-	$(NULL)
deleted file mode 100644
--- a/dom/tests/mochitest/ajax/jquery/test/data/moz.build
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-DIRS += ['offset']
deleted file mode 100644
--- a/dom/tests/mochitest/ajax/jquery/test/data/offset/Makefile.in
+++ /dev/null
@@ -1,13 +0,0 @@
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-MOCHITEST_FILES	= \
-	absolute.html \
-	fixed.html \
-	relative.html \
-	scroll.html \
-	static.html \
-	table.html \
-	$(NULL)
deleted file mode 100644
--- a/dom/tests/mochitest/ajax/jquery/test/data/offset/moz.build
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
deleted file mode 100644
--- a/dom/tests/mochitest/ajax/jquery/test/moz.build
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-DIRS += ['data', 'unit']
deleted file mode 100644
--- a/dom/tests/mochitest/ajax/jquery/test/unit/Makefile.in
+++ /dev/null
@@ -1,14 +0,0 @@
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-MOCHITEST_FILES	= \
-	ajax.js \
-	core.js \
-	dimensions.js \
-	event.js \
-	fx.js \
-	offset.js \
-	selector.js \
-	$(NULL)
deleted file mode 100644
--- a/dom/tests/mochitest/ajax/jquery/test/unit/moz.build
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
--- a/dom/tests/mochitest/ajax/moz.build
+++ b/dom/tests/mochitest/ajax/moz.build
@@ -5,10 +5,14 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 DIRS += [
     'lib',
     'prototype',
     'offline',
     'mochikit',
     'scriptaculous',
-    'jquery',
 ]
+
+MOCHITEST_MANIFESTS += [
+    'jquery/mochitest.ini',
+]
+