Bug 896695 - Re-enable accidentally disabled toolkit/devtools/apps xpcshell tests; r=mshal
authorGregory Szorc <gps@mozilla.com>
Tue, 20 Aug 2013 10:05:52 -0700
changeset 156196 71fa40e0ced391b1843cbbbafa1b3cc5c816adbd
parent 156195 092dd07390a1e224727a6f30c7c10c98433ff12b
child 156197 faca4da6cadd671dba47437f173b082b0717bc5e
push id2961
push userlsblakk@mozilla.com
push dateMon, 28 Oct 2013 21:59:28 +0000
treeherdermozilla-beta@73ef4f13486f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmshal
bugs896695
milestone26.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 896695 - Re-enable accidentally disabled toolkit/devtools/apps xpcshell tests; r=mshal
config/rules.mk
js/src/config/rules.mk
toolkit/devtools/apps/tests/Makefile.in
toolkit/devtools/apps/tests/moz.build
toolkit/devtools/apps/tests/unit/xpcshell.ini
--- a/config/rules.mk
+++ b/config/rules.mk
@@ -25,16 +25,17 @@ endif
   HOST_CSRCS \
   HOST_LIBRARY_NAME \
   MODULE \
   NO_DIST_INSTALL \
   PARALLEL_DIRS \
   TEST_DIRS \
   TIERS \
   TOOL_DIRS \
+  XPCSHELL_TESTS \
   XPIDL_MODULE \
   $(NULL)
 
 _DEPRECATED_VARIABLES := \
   XPIDL_FLAGS \
   $(NULL)
 
 ifndef EXTERNALLY_MANAGED_MAKE_FILE
--- a/js/src/config/rules.mk
+++ b/js/src/config/rules.mk
@@ -25,16 +25,17 @@ endif
   HOST_CSRCS \
   HOST_LIBRARY_NAME \
   MODULE \
   NO_DIST_INSTALL \
   PARALLEL_DIRS \
   TEST_DIRS \
   TIERS \
   TOOL_DIRS \
+  XPCSHELL_TESTS \
   XPIDL_MODULE \
   $(NULL)
 
 _DEPRECATED_VARIABLES := \
   XPIDL_FLAGS \
   $(NULL)
 
 ifndef EXTERNALLY_MANAGED_MAKE_FILE
deleted file mode 100644
--- a/toolkit/devtools/apps/tests/Makefile.in
+++ /dev/null
@@ -1,15 +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/.
-
-DEPTH           = @DEPTH@
-topsrcdir       = @top_srcdir@
-srcdir          = @srcdir@
-VPATH           = @srcdir@
-relativesrcdir = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-XPCSHELL_TESTS = unit
-
-include $(topsrcdir)/config/rules.mk
--- a/toolkit/devtools/apps/tests/moz.build
+++ b/toolkit/devtools/apps/tests/moz.build
@@ -1,7 +1,9 @@
 # -*- 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/.
 
 MODULE = 'test_webapps_actor'
+
+XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini']
--- a/toolkit/devtools/apps/tests/unit/xpcshell.ini
+++ b/toolkit/devtools/apps/tests/unit/xpcshell.ini
@@ -1,6 +1,10 @@
 [DEFAULT]
 head = head_apps.js
 tail = tail_apps.js
 
 [test_webappsActor.js]
+# Persistent failures.
+skip-if = true
 [test_appInstall.js]
+# Persistent failures.
+skip-if = true