--- a/mail/testsuite-targets.mk
+++ b/mail/testsuite-targets.mk
@@ -1,17 +1,12 @@
# 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/.
-# Additional mailnews targets to call automated test suites
-include $(topsrcdir)/mailnews/testsuite-targets.mk
-
-# Instructions below this line are for mail/ specific tests.
-
MOZMILLDIR=$(DEPTH)/mozilla/_tests/mozmill
ifeq ($(OS_ARCH),WINNT)
VIRTUALENV_BIN = $(MOZMILLDIR)/../mozmill-virtualenv/Scripts
else
VIRTUALENV_BIN = $(MOZMILLDIR)/../mozmill-virtualenv/bin
endif
MOZMILLPYTHON = $(call core_abspath,$(VIRTUALENV_BIN)/python$(BIN_SUFFIX))
--- a/mailnews/moz.build
+++ b/mailnews/moz.build
@@ -36,17 +36,16 @@ if CONFIG['OS_ARCH'] == 'WINNT':
if not CONFIG['GNU_CC']:
PARALLEL_DIRS += [
'import/oexpress',
'import/winlivemail',
]
TEST_TOOL_DIRS += [
- 'test/performance/bloat',
'imap/test',
'import/test',
'local/test',
]
if CONFIG['MOZ_MAPI_SUPPORT']:
PARALLEL_DIRS += [
'mapi/mapiDLL',
deleted file mode 100644
--- a/mailnews/test/performance/bloat/Makefile.in
+++ /dev/null
@@ -1,22 +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
-
-USE_EXTENSION_MANIFEST = 1
-DIST_FILES = install.rdf
-
-include $(topsrcdir)/config/rules.mk
-
-FINAL_TARGET = $(MOZDEPTH)/_tests/mailbloat/mailbloat
-
-libs::
- $(NSINSTALL) -D $(FINAL_TARGET)/defaults/preferences
- $(NSINSTALL) $(srcdir)/mailnewsTestPrefs.js $(FINAL_TARGET)/defaults/preferences
deleted file mode 100644
--- a/mailnews/test/performance/bloat/bloatAddrOverlay.js
+++ /dev/null
@@ -1,28 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- * 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/. */
-
-// Milliseconds. Decided on MacBook 2.4GHz Intel (Dual Core).
-// 3s seemed a resonable time for the address book window to be displayed.
-const kABStartup = 3000;
-
-var gCurrentTimeout;
-
-function startABTest()
-{
- removeEventListener("load", startABTest, false);
-
- // load gets called before we've finished displaying/really loading, so we
- // have to have a bit of a timeout to allow it to get to that stage.
- gCurrentTimeout = setTimeout(mainABTest, kABStartup);
-}
-
-function mainABTest()
-{
- // Close the window.
- window.close();
-}
-
-// Add the startABTest call to the load event for the window.
-addEventListener("load", startABTest, false);
deleted file mode 100644
--- a/mailnews/test/performance/bloat/bloatAddrOverlay.xul
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.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/. -->
-
-<overlay id="bloatAddrOverlay" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
- <script src="chrome://mailbloat/content/bloatAddrOverlay.js"/>
-</overlay>
-
deleted file mode 100644
--- a/mailnews/test/performance/bloat/bloatComposeOverlay.js
+++ /dev/null
@@ -1,30 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- * 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/. */
-
-// Milliseconds. Decided on MacBook 2.4GHz Intel (Dual Core).
-// 200ms would crash, 2s seemed stable and enough time for the window to
-// actually be displayed, so left it as 3s.
-const kComposeStartup = 3000;
-
-var gCurrentTimeout;
-
-function startComposeTest()
-{
- removeEventListener("load", startComposeTest, false);
-
- // load gets called before we've finished displaying/really loading, so we
- // have to have a bit of a timeout to allow it to get to that stage.
- gCurrentTimeout = setTimeout(handleComposeTest, kComposeStartup);
-}
-
-function handleComposeTest()
-{
- // Call the correct close compose window function, this also skips the
- // are you sure you want to close it prompt (bug 321783).
- MsgComposeCloseWindow(true);
-}
-
-// Add the startBloatTest call to the load event for the window.
-addEventListener("load", startComposeTest, false);
deleted file mode 100644
--- a/mailnews/test/performance/bloat/bloatComposeOverlay.xul
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.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/. -->
-
-<overlay id="bloatComposeOverlay" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
- <script src="chrome://mailbloat/content/bloatComposeOverlay.js"/>
-</overlay>
-
deleted file mode 100644
--- a/mailnews/test/performance/bloat/bloatMainOverlay.js
+++ /dev/null
@@ -1,56 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- * 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:///modules/mailServices.js");
-Components.utils.import("resource://gre/modules/Services.jsm");
-
-// Milliseconds. Decided on MacBook 2.4GHz Intel (Dual Core).
-// 4s seemed a resonable time for the main window to be displayed.
-const kMailStartup = 4000;
-// The other two windows (compose + addrbook) are closed after 3 seconds,
-// well close after 8 to allow a little extra time - if they get delayed, then
-// well get a prompt for closing the compose window that we don't want.
-// See bug 321783.
-const kMailClose = 8000;
-
-const kMailWaitTotal = kMailStartup + kMailClose;
-
-function startMainTest()
-{
- removeEventListener("load", startMainTest, false);
-
- setTimeout(shutdownMainWindow, kMailWaitTotal);
-
- // First thing to do is to start the address book and compose windows
- toOpenWindowByType("mail:addressbook",
- "chrome://messenger/content/addressbook/addressbook.xul");
-
- startComposeWindow();
-}
-
-function shutdownMainWindow()
-{
- var window = Services.wm.getMostRecentWindow("msgcompose");
-
- // Double-check because of bug 321783
- if (window)
- {
- // It hasn't shutdown yet, reset the timeout
- dump("XXX Trying to quit too early, delaying shutdown to stop bug 321783 affecting us\n");
- setTimeout(shutdownMainWindow, kMailWaitTotal);
- return;
- }
-
- goQuitApplication();
-}
-
-function startComposeWindow()
-{
- // Compose a new message, format HTML, default identity
- MailServices.compose.OpenComposeWindow(null, null, null, 0, 1, null, null);
-}
-
-// Add the startMainTest call to the load event for the window.
-addEventListener("load", startMainTest, false);
deleted file mode 100644
--- a/mailnews/test/performance/bloat/bloatMainOverlay.xul
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.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/. -->
-
-<overlay id="bloatMainOverlay" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
- <script src="chrome://mailbloat/content/bloatMainOverlay.js"/>
-</overlay>
-
deleted file mode 100644
--- a/mailnews/test/performance/bloat/install.rdf
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0"?>
-
-<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:em="http://www.mozilla.org/2004/em-rdf#">
- <Description about="urn:mozilla:install-manifest">
- <em:id>mailbloat@mozilla.org</em:id>
- <em:version>1.0</em:version>
- <em:targetApplication>
- <Description>
- <em:id>toolkit@mozilla.org</em:id>
-#expand <em:minVersion>__MOZILLA_VERSION_U__</em:minVersion>
-#expand <em:maxVersion>__MOZILLA_VERSION_U__</em:maxVersion>
- </Description>
- </em:targetApplication>
- <!-- Front End MetaData -->
- <em:name>Mail Bloat Tests</em:name>
- <em:description>Run Mail Bloat Tests</em:description>
- <em:creator>Mark Banner</em:creator>
- </Description>
-</RDF>
deleted file mode 100644
--- a/mailnews/test/performance/bloat/jar.mn
+++ /dev/null
@@ -1,11 +0,0 @@
-mailbloat.jar:
-% content mailbloat %content/
-% overlay chrome://messenger/content/messenger.xul chrome://mailbloat/content/bloatMainOverlay.xul
-% overlay chrome://messenger/content/addressbook/addressbook.xul chrome://mailbloat/content/bloatAddrOverlay.xul
-% overlay chrome://messenger/content/messengercompose/messengercompose.xul chrome://mailbloat/content/bloatComposeOverlay.xul
- content/bloatMainOverlay.js (bloatMainOverlay.js)
- content/bloatMainOverlay.xul (bloatMainOverlay.xul)
- content/bloatAddrOverlay.js (bloatAddrOverlay.js)
- content/bloatAddrOverlay.xul (bloatAddrOverlay.xul)
- content/bloatComposeOverlay.js (bloatComposeOverlay.js)
- content/bloatComposeOverlay.xul (bloatComposeOverlay.xul)
deleted file mode 100644
--- a/mailnews/test/performance/bloat/mailnewsTestPrefs.js
+++ /dev/null
@@ -1,61 +0,0 @@
-//
-// Common preferences.
-//
-// This set of prefs is copyied over the defaults that build-seamonkey-util.pl
-// sets up.
-user_pref("browser.dom.window.dump.enabled", true);
-// no slow script dialogs
-user_pref("dom.max_chrome_script_run_time", 0);
-user_pref("dom.max_script_run_time", 0);
-user_pref("extensions.autoDisableScopes", 10);
-user_pref("mail.account.account1.server", "server1");
-user_pref("mail.account.account2.identities", "id1");
-user_pref("mail.account.account2.server", "server2");
-user_pref("mail.accountmanager.accounts", "account1,account2");
-user_pref("mail.accountmanager.defaultaccount", "account2");
-user_pref("mail.accountmanager.localfoldersserver", "server1");
-user_pref("mail.identity.id1.fullName", "Tinderbox");
-user_pref("mail.identity.id1.smtpServer", "smtp1");
-user_pref("mail.identity.id1.useremail", "tinderbox@foo.invalid");
-user_pref("mail.identity.id1.valid", true);
-user_pref("mail.root.none-rel", "[ProfD]Mail");
-user_pref("mail.root.pop3-rel", "[ProfD]Mail");
-user_pref("mail.server.server1.directory-rel", "[ProfD]Mail/Local Folders");
-user_pref("mail.server.server1.hostname", "Local Folders");
-user_pref("mail.server.server1.name", "Local Folders");
-user_pref("mail.server.server1.type", "none");
-user_pref("mail.server.server1.userName", "nobody");
-user_pref("mail.server.server2.check_new_mail", false);
-user_pref("mail.server.server2.directory-rel", "[ProfD]Mail/tinderbox");
-user_pref("mail.server.server2.download_on_biff", true);
-user_pref("mail.server.server2.hostname", "tinderbox");
-user_pref("mail.server.server2.login_at_startup", false);
-user_pref("mail.server.server2.name", "tinderbox@foo.invalid");
-user_pref("mail.server.server2.type", "pop3");
-user_pref("mail.server.server2.userName", "tinderbox");
-user_pref("mail.smtp.defaultserver", "smtp1");
-user_pref("mail.smtpserver.smtp1.hostname", "tinderbox");
-user_pref("mail.smtpserver.smtp1.username", "tinderbox");
-user_pref("mail.smtpservers", "smtp1");
-user_pref("mail.startup.enabledMailCheckOnce", true);
-user_pref("mailnews.start_page_override.mstone", "ignore");
-user_pref("mailnews.database.global.indexer.enabled", false);
-// Ensure OS X and Outlook/OE books are disabled
-user_pref("ldap_2.servers.osx.position", 0);
-user_pref("ldap_2.servers.oe.position", 0);
-// Suppress Telemetry opt-in prompt
-user_pref("toolkit.telemetry.prompted", 999);
-
-//
-// SeaMonkey preferences.
-//
-user_pref("shell.checkDefaultClient", false);
-
-//
-// Thunderbird preferences.
-//
-user_pref("mail.shell.checkDefaultClient", false);
-user_pref("mail.spotlight.enable", false);
-user_pref("mail.spotlight.firstRunDone", true);
-user_pref("mail.winsearch.enable", false);
-user_pref("mail.winsearch.firstRunDone", true);
deleted file mode 100644
--- a/mailnews/test/performance/bloat/moz.build
+++ /dev/null
@@ -1,7 +0,0 @@
-# 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 = 'mailbloat'
-
deleted file mode 100755
--- a/mailnews/test/performance/bloat/runtest.py
+++ /dev/null
@@ -1,195 +0,0 @@
-#!/usr/bin/env 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/.
-
-"""
-Runs the Bloat test harness
-"""
-
-import optparse
-import sys
-import os
-import shutil
-
-from automation import Automation
-automation = Automation()
-
-# --------------------------------------------------------------
-# TODO: this is a hack for mozbase without virtualenv, remove with bug 849900
-#
-here = os.path.dirname(__file__)
-mozbase = os.path.realpath(os.path.join(os.path.dirname(here), 'mozbase'))
-
-try:
- import mozcrash
-except:
- deps = ['mozcrash',
- 'mozlog']
- for dep in deps:
- module = os.path.join(mozbase, dep)
- if module not in sys.path:
- sys.path.append(module)
- import mozcrash
-# ---------------------------------------------------------------
-
-class BloatRunTestOptions(optparse.OptionParser):
- """Parses Bloat runtest.py commandline options."""
- def __init__(self, **kwargs):
- optparse.OptionParser.__init__(self, **kwargs)
- defaults = {}
-
- self.add_option("--distdir",
- action = "store", type = "string", dest = "distdir",
- help = "object directory of build to run")
- defaults["distdir"] = "distdir-tb"
-
- self.add_option("--bin",
- action = "store", type = "string", dest = "bin",
- help = "application binary name")
- defaults["bin"] = "thunderbird"
-
- self.add_option("--brand",
- action = "store", type = "string", dest = "brand",
- help = "The current branding, including Debug if necessary")
- defaults["brand"] = "Daily"
-
- self.add_option("--symbols-path",
- action = "store", type = "string", dest = "symbols",
- help = "The path to the symbol files from build_symbols")
- defaults["symbols"] = ""
-
- self.add_option("--extra-startup-arg",
- action = "store", type = "string", dest = "extraArg",
- help = "Extra startup argument if required, at the moment this will only support one extra argument with no parameters")
- defaults["extraArg"] = ""
-
- self.set_defaults(**defaults);
-
- usage = """\
-Usage instructions for runtest.py.
-All arguments must be specified.
-"""
- self.set_usage(usage)
-
-
-parser = BloatRunTestOptions()
-options, args = parser.parse_args()
-
-if options.distdir == "" or options.bin == "" or options.brand == "":
- parser.print_help()
- sys.exit(1)
-
-DISTDIR = os.path.abspath(os.path.realpath(options.distdir))
-print DISTDIR
-
-CWD = os.getcwd()
-SCRIPTDIR = os.path.abspath(os.path.realpath(os.path.dirname(sys.argv[0])))
-
-if automation.IS_MAC:
- APPBUNDLE = options.brand + '.app'
- BINDIR = os.path.join(DISTDIR, APPBUNDLE, 'Contents', 'MacOS')
-else:
- BINDIR = os.path.join(DISTDIR, 'bin')
-
-BIN = os.path.join(BINDIR, options.bin)
-EXTENSIONDIR = os.path.join(DISTDIR, '..', '_tests', 'mailbloat', 'mailbloat')
-PROFILE = os.path.join(DISTDIR, '..', '_tests', 'mailbloat', 'leakprofile')
-print BIN
-
-# Wipe the profile
-if os.path.exists(PROFILE):
- shutil.rmtree(PROFILE)
-os.mkdir(PROFILE)
-
-defaultEnv = automation.environment()
-defaultEnv['NO_EM_RESTART'] = '1'
-if (not "XPCOM_DEBUG_BREAK" in defaultEnv):
- defaultEnv['XPCOM_DEBUG_BREAK'] = 'stack'
-
-defaultArgs = ['-no-remote']
-if automation.IS_MAC:
- defaultArgs.append('-foreground')
-
-COMMANDS = [
- {
- 'name': 'register',
- 'args': ['-register'],
- },
- {
- 'name': 'createProfile',
- 'args': ['-CreateProfile', 'bloat ' + PROFILE],
- },
- {
- 'name': 'setupProfile'
- },
- {
- 'name': 'bloatTests',
- 'args': ['-profile', PROFILE],
- 'env': {'XPCOM_MEM_BLOAT_LOG': 'bloat.log'},
- },
- {
- 'name': 'leakTests',
- 'args': ['-profile', PROFILE,
- '--trace-malloc', 'malloc.log',
- '--shutdown-leaks', 'sdleak.log',
- ],
- 'env': {'XPCOM_MEM_BLOAT_LOG': 'trace-bloat.log'},
- },
-]
-
-
-for cmd in COMMANDS:
- # Some scripts rely on the cwd
- cwd = CWD
- if 'cwd' in cmd:
- cwd = cmd['cwd']
- os.chdir(cwd)
-
- if cmd['name'] == 'setupProfile':
- automation.installExtension(EXTENSIONDIR, PROFILE, "mailbloat@mozilla.org")
- print "Hello"
- continue
-
- # Set up the environment
- mailnewsEnv = defaultEnv
- if 'env' in cmd:
- mailnewsEnv.update(cmd['env'])
-
- # Build the command
- binary = BIN
- # Copy default args, using the : option.
- args = defaultArgs[:]
- args.extend(cmd['args'])
-
- if options.extraArg != "":
- args.append(options.extraArg)
-
- # Different binary implies no default args
- if 'bin' in cmd:
- binary = cmd['bin']
- args = cmd['args']
-
- print >> sys.stderr, 'INFO | runtest.py | Running ' + cmd['name'] + ' in ' + CWD + ' : '
- print >> sys.stderr, 'INFO | runtest.py | ', binary, args
- envkeys = mailnewsEnv.keys()
- envkeys.sort()
- for envkey in envkeys:
- print >> sys.stderr, "%s=%s"%(envkey, mailnewsEnv[envkey])
-
- proc = automation.Process([binary] + args, env = mailnewsEnv)
-
- status = proc.wait()
- if status != 0:
- print >> sys.stderr, "TEST-UNEXPECTED-FAIL | runtest.py | Exited with code %d during test run"%(status)
-
- if mozcrash.check_for_crashes(os.path.join(PROFILE, "minidumps"), options.symbols, cmd['name']):
- print >> sys.stderr, 'TinderboxPrint: ' + cmd['name'] + '<br/><em class="testfail">CRASH</em>'
- status = 1
-
- if status != 0:
- sys.exit(status)
-
- print >> sys.stderr, 'INFO | runtest.py | ' + cmd['name'] + ' executed successfully.'
-
-print >> sys.stderr, 'INFO | runtest.py | All tests executed successfully.'
deleted file mode 100644
--- a/mailnews/testsuite-targets.mk
+++ /dev/null
@@ -1,23 +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/.
-
-APP_NAME := $(MOZ_APP_DISPLAYNAME)
-
-ifdef MOZ_DEBUG
-APP_NAME := $(APP_NAME)Debug
-endif
-
-SYMBOLS_PATH := --symbols-path=$(DIST)/crashreporter-symbols
-
-# BLOAT_EXTRA_ARG lets an application add an extra startup argument.
-ifdef BLOAT_EXTRA_ARG
-BLOAT_EXTRA_STARTUP_ARG := --extra-startup-arg=$(BLOAT_EXTRA_ARG)
-endif
-
-mailbloat:
- $(PYTHON) -u $(topsrcdir)/mozilla/config/pythonpath.py \
- -I$(DIST)/../build -I$(MOZILLA_DIR)/build \
- $(topsrcdir)/mailnews/test/performance/bloat/runtest.py \
- --distdir=$(DIST) --bin=$(MOZ_APP_NAME) --brand=$(APP_NAME) \
- $(SYMBOLS_PATH) $(BLOAT_EXTRA_STARTUP_ARG)
--- a/suite/build.mk
+++ b/suite/build.mk
@@ -38,22 +38,9 @@ mochitest-browser-chrome:
$(RUN_MOCHITEST) --browser-chrome
$(CHECK_TEST_ERROR)
mochitest:: mochitest-browser-chrome
.PHONY: mochitest-browser-chrome
endif
-else # toplevel Makefile
-
-ifdef ENABLE_TESTS
-# This part is copied from mail/testsuite-targets.mk,
-# SeaMonkey does not need to create a suite/testsuite-targets.mk yet.
-
-# "-mail : Open the mail folder view" (instead of "a browser window").
-BLOAT_EXTRA_ARG := -mail
-
-# Additional mailnews targets to call automated test suites.
-include $(topsrcdir)/mailnews/testsuite-targets.mk
-endif
-
endif # COMM_BUILD
