Bug 1117456 - Run unit tests on ical.js as well as libical; r=Fallen, a=me
authorGeoff Lankow <geoff@darktrojan.net>
Mon, 05 Jan 2015 14:20:32 +1300
changeset 21583 6b286c943119d245d960e7f1a8c14d63034f4383
parent 21582 e8391a2ebe3e7705771b19af6318b0f63e33010c
child 21584 c92b8904d33e4be449fc79451ba8a6e08298566f
push id1305
push usermbanner@mozilla.com
push dateMon, 23 Feb 2015 19:48:12 +0000
treeherdercomm-beta@3ae4f13858fd [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersFallen, me
bugs1117456
Bug 1117456 - Run unit tests on ical.js as well as libical; r=Fallen, a=me
calendar/test/moz.build
calendar/test/unit/head_icaljs.js
calendar/test/unit/xpcshell-icaljs.ini
calendar/test/unit/xpcshell-libical.ini
calendar/test/unit/xpcshell-shared.ini
calendar/test/unit/xpcshell.ini
--- a/calendar/test/moz.build
+++ b/calendar/test/moz.build
@@ -1,9 +1,12 @@
 # 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 += ['mozmill']
 
-XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini']
+XPCSHELL_TESTS_MANIFESTS += [
+    'unit/xpcshell-icaljs.ini',
+    'unit/xpcshell-libical.ini',
+]
 
new file mode 100644
--- /dev/null
+++ b/calendar/test/unit/head_icaljs.js
@@ -0,0 +1,6 @@
+/* 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/. */
+
+Components.utils.import("resource://gre/modules/Preferences.jsm");
+Preferences.set("calendar.icaljs", true);
new file mode 100644
--- /dev/null
+++ b/calendar/test/unit/xpcshell-icaljs.ini
@@ -0,0 +1,7 @@
+[DEFAULT]
+head = head_icaljs.js head_consts.js
+tail =
+run-sequentially = Avoid bustage.
+dupe-manifest =
+
+[include:xpcshell-shared.ini]
new file mode 100644
--- /dev/null
+++ b/calendar/test/unit/xpcshell-libical.ini
@@ -0,0 +1,7 @@
+[DEFAULT]
+head = head_consts.js
+tail =
+run-sequentially = Avoid bustage.
+dupe-manifest =
+
+[include:xpcshell-shared.ini]
rename from calendar/test/unit/xpcshell.ini
rename to calendar/test/unit/xpcshell-shared.ini
--- a/calendar/test/unit/xpcshell.ini
+++ b/calendar/test/unit/xpcshell-shared.ini
@@ -1,13 +1,8 @@
-[DEFAULT]
-head = head_consts.js
-tail =
-run-sequentially = Avoid bustage.
-
 [test_alarm.js]
 [test_alarmservice.js]
 [test_attachment.js]
 [test_attendee.js]
 [test_bug272411.js]
 [test_bug343792.js]
 [test_bug350845.js]
 [test_bug356207.js]