Bug 1089032 - Removing invalid mochitests and adding support-files in dom/encoding/test. r=jmaher
authorVaibhav Agrawal <vaibhavmagarwal@gmail.com>
Thu, 30 Oct 2014 10:43:00 +0100
changeset 213360 a9e7f26a5021f8fdbd32ddb2727dd156dd384db4
parent 213359 31ba965679df37ef32ed52c671fa03cecc42066a
child 213361 a8538652ffa304cebaa489a65abcd377e41c7c30
push id27748
push userryanvm@gmail.com
push dateFri, 31 Oct 2014 20:14:33 +0000
treeherdermozilla-central@12ac66e2c016 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjmaher
bugs1089032
milestone36.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 1089032 - Removing invalid mochitests and adding support-files in dom/encoding/test. r=jmaher
dom/encoding/moz.build
dom/encoding/test/mochitest.ini
dom/encoding/test/unit/mochitest.ini
dom/encoding/test/unit/moz.build
--- a/dom/encoding/moz.build
+++ b/dom/encoding/moz.build
@@ -30,12 +30,11 @@ GENERATED_FILES += [
     'encodingsgroups.properties.h',
     'labelsencodings.properties.h',
     'localesfallbacks.properties.h',
     'nonparticipatingdomains.properties.h',
 ]
 
 MOCHITEST_MANIFESTS += [
     'test/mochitest.ini',
-    'test/unit/mochitest.ini',
 ]
 MOCHITEST_CHROME_MANIFESTS += ['test/chrome.ini']
 XPCSHELL_TESTS_MANIFESTS += ['test/unit/xpcshell.ini']
--- a/dom/encoding/test/mochitest.ini
+++ b/dom/encoding/test/mochitest.ini
@@ -4,16 +4,22 @@ support-files =
   file_utf16_be_bom.css
   file_utf16_be_bom.js
   file_utf16_be_bom.xhtml
   file_utf16_le_bom.css
   file_utf16_le_bom.js
   file_utf16_le_bom.xhtml
   file_utf16_le_nobom.xhtml
   file_TLD.html
+  unit/test_big5.js
+  unit/test_euc-jp.js
+  unit/test_euc-kr.js
+  unit/test_gbk.js
+  unit/test_iso-2022-jp.js
+  unit/test_shift_jis.js
   worker_helper.js
 
 [test_BOMEncoding.js]
 [test_TextDecoder.html]
 [test_TextDecoder.js]
 [test_TextEncoder.html]
 [test_TextEncoder.js]
 [test_stringencoding.html]
deleted file mode 100644
--- a/dom/encoding/test/unit/mochitest.ini
+++ /dev/null
@@ -1,9 +0,0 @@
-[DEFAULT]
-skip-if = e10s
-
-[test_big5.js]
-[test_euc-jp.js]
-[test_euc-kr.js]
-[test_gbk.js]
-[test_iso-2022-jp.js]
-[test_shift_jis.js]
deleted file mode 100644
--- a/dom/encoding/test/unit/moz.build
+++ /dev/null
@@ -1,8 +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/.
-
-MOCHITEST_MANIFESTS += ['mochitest.ini']
-