From 4881f81e4bd35a8e57c9bdd117a2701bb9035ede Mon Sep 17 00:00:00 2001 From: Brian O'Keefe Date: Fri, 21 Mar 2014 16:25:55 -0700 Subject: [PATCH] Bug 883092 - Move mochitest support files from Makefile.in to a manifest; r=gps f=Ms2ger --- dom/imptests/Makefile.in | 14 -------------- dom/imptests/mochitest.ini | 7 +++++++ dom/imptests/moz.build | 1 + 3 files changed, 8 insertions(+), 14 deletions(-) delete mode 100644 dom/imptests/Makefile.in create mode 100644 dom/imptests/mochitest.ini diff --git a/dom/imptests/Makefile.in b/dom/imptests/Makefile.in deleted file mode 100644 index 397ab02d4458..000000000000 --- a/dom/imptests/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/. - -SUPPORT_FILES = \ - testharness.js \ - testharnessreport.js \ - testharness.css \ - idlharness.js \ - WebIDLParser.js \ - $(NULL) - -SUPPORT_DEST = $(DEPTH)/_tests/testing/mochitest/resources -INSTALL_TARGETS += SUPPORT diff --git a/dom/imptests/mochitest.ini b/dom/imptests/mochitest.ini new file mode 100644 index 000000000000..b3659e25b72f --- /dev/null +++ b/dom/imptests/mochitest.ini @@ -0,0 +1,7 @@ +[DEFAULT] +support-files = + /resources/testharness.js + /resources/testharnessreport.js + /resources/testharness.css + /resources/idlharness.js + /resources/WebIDLParser.js diff --git a/dom/imptests/moz.build b/dom/imptests/moz.build index fad48998e841..0182e15da0a8 100644 --- a/dom/imptests/moz.build +++ b/dom/imptests/moz.build @@ -7,6 +7,7 @@ MOCHITEST_MANIFESTS += [ 'editing/mochitest.ini', 'html/mochitest.ini', + 'mochitest.ini', 'webapps/mochitest.ini', ]