summaryrefslogtreecommitdiff
path: root/toolkit
diff options
context:
space:
mode:
authorMoonchild <moonchild@palemoon.org>2020-06-08 18:12:08 +0000
committerMoonchild <moonchild@palemoon.org>2020-06-08 18:12:08 +0000
commitb0901eb0990191e1f063bfa13cb11701571612fd (patch)
treea2bf352e4f2cb73fc2000636ea8c2aec0130e82a /toolkit
parente8bdf27ac712ffca8fd680100f3c7d4b33241e49 (diff)
downloaduxp-b0901eb0990191e1f063bfa13cb11701571612fd.tar.gz
Issue #439 - Remove, fix and clean up automated tests
With the big amount of code churn around DOM a lot of tests broke severely enough that they caused build bustage. This commit cleans up, removes or otherwise fixes tests that are broken, no longer relevant or obsolete.
Diffstat (limited to 'toolkit')
-rw-r--r--toolkit/mozapps/update/updater/moz.build2
-rw-r--r--toolkit/mozapps/update/updater/updater-xpcshell/Makefile.in41
-rw-r--r--toolkit/mozapps/update/updater/updater-xpcshell/moz.build14
3 files changed, 0 insertions, 57 deletions
diff --git a/toolkit/mozapps/update/updater/moz.build b/toolkit/mozapps/update/updater/moz.build
index 1cca83b5b9..52eaba21d1 100644
--- a/toolkit/mozapps/update/updater/moz.build
+++ b/toolkit/mozapps/update/updater/moz.build
@@ -11,8 +11,6 @@ else:
updater_rel_path = ''
include('updater-common.build')
-if CONFIG['ENABLE_TESTS']:
- DIRS += ['updater-xpcshell']
CXXFLAGS += CONFIG['MOZ_BZ2_CFLAGS']
diff --git a/toolkit/mozapps/update/updater/updater-xpcshell/Makefile.in b/toolkit/mozapps/update/updater/updater-xpcshell/Makefile.in
deleted file mode 100644
index 01822b1861..0000000000
--- a/toolkit/mozapps/update/updater/updater-xpcshell/Makefile.in
+++ /dev/null
@@ -1,41 +0,0 @@
-# vim:set ts=8 sw=8 sts=8 noet:
-# 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/.
-
-# For changes here, also consider ../Makefile.in
-
-XPCSHELLTESTROOT = $(topobjdir)/_tests/xpcshell/toolkit/mozapps/update/tests
-MOCHITESTROOT = $(topobjdir)/_tests/testing/mochitest/chrome/toolkit/mozapps/update/tests
-
-include $(topsrcdir)/config/rules.mk
-
-ifndef MOZ_WINCONSOLE
-ifdef MOZ_DEBUG
-MOZ_WINCONSOLE = 1
-else
-MOZ_WINCONSOLE = 0
-endif
-endif
-
-ifdef COMPILE_ENVIRONMENT
-tools::
-ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
- # Copy for xpcshell tests
- $(NSINSTALL) -D $(XPCSHELLTESTROOT)/data/updater-xpcshell.app
- rsync -a -C --exclude '*.in' $(srcdir)/../macbuild/Contents $(XPCSHELLTESTROOT)/data/updater-xpcshell.app
- sed -e 's/%APP_NAME%/$(MOZ_APP_DISPLAYNAME)/' $(srcdir)/../macbuild/Contents/Resources/English.lproj/InfoPlist.strings.in | \
- iconv -f UTF-8 -t UTF-16 > $(XPCSHELLTESTROOT)/data/updater-xpcshell.app/Contents/Resources/English.lproj/InfoPlist.strings
- $(NSINSTALL) -D $(XPCSHELLTESTROOT)/data/updater-xpcshell.app/Contents/MacOS/updater-xpcshell
- $(NSINSTALL) updater-xpcshell $(XPCSHELLTESTROOT)/data/updater-xpcshell.app/Contents/MacOS
- rm -Rf $(XPCSHELLTESTROOT)/data/updater.app
- mv $(XPCSHELLTESTROOT)/data/updater-xpcshell.app $(XPCSHELLTESTROOT)/data/updater.app
- mv $(XPCSHELLTESTROOT)/data/updater.app/Contents/MacOS/updater-xpcshell $(XPCSHELLTESTROOT)/data/updater.app/Contents/MacOS/org.mozilla.updater
-
- # Copy for mochitest chrome tests
- rsync -a -C $(XPCSHELLTESTROOT)/data/updater.app $(MOCHITESTROOT)/data/
-else
- cp $(PROGRAM) $(XPCSHELLTESTROOT)/data/updater$(BIN_SUFFIX)
- cp $(PROGRAM) $(MOCHITESTROOT)/data/updater$(BIN_SUFFIX)
-endif
-endif # COMPILE_ENVIRONMENT
diff --git a/toolkit/mozapps/update/updater/updater-xpcshell/moz.build b/toolkit/mozapps/update/updater/updater-xpcshell/moz.build
deleted file mode 100644
index 710b7e1dec..0000000000
--- a/toolkit/mozapps/update/updater/updater-xpcshell/moz.build
+++ /dev/null
@@ -1,14 +0,0 @@
-# -*- Mode: python; 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/.
-
-Program('updater-xpcshell')
-
-updater_rel_path = '../'
-DIST_INSTALL = False
-DEFINES['TEST_UPDATER'] = True
-include('../updater-common.build')
-
-CXXFLAGS += CONFIG['MOZ_BZ2_CFLAGS']