mozilla
/
pjs
зеркало из https://github.com/mozilla/pjs.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Bug 543800 Package chrome style tests into .jar file for Android testing r=ted a=NPOTB

This commit is contained in:
Joel Maher 2010-09-30 16:50:24 -07:00
Родитель 8543ff90e4
Коммит db0824c44e
11 изменённых файлов: 226 добавлений и 94 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

3
Makefile.in
Просмотреть файл

@ -120,9 +120,6 @@ export::
ifdef ENABLE_TESTS
# Additional makefile targets to call automated test suites
include $(topsrcdir)/testing/testsuite-targets.mk
else
# OS X Universal builds will want to call this, so stub it out
package-tests:
endif
include $(topsrcdir)/config/rules.mk

4
build/macosx/universal/flight.mk
Просмотреть файл

@ -121,8 +121,8 @@ postflight_all:
# A universal .dmg can now be produced by making in either architecture's
# INSTALLER_DIR.
# Now, repeat the process for the test package.
$(MAKE) -C $(OBJDIR_ARCH_1) UNIVERSAL_BINARY= package-tests
$(MAKE) -C $(OBJDIR_ARCH_2) UNIVERSAL_BINARY= package-tests
$(MAKE) -C $(OBJDIR_ARCH_1) UNIVERSAL_BINARY= CHROME_JAR= package-tests
$(MAKE) -C $(OBJDIR_ARCH_2) UNIVERSAL_BINARY= CHROME_JAR= package-tests
rm -rf $(DIST_UNI)/test-package-stage
# automation.py differs because it hardcodes a path to
# dist/bin. It doesn't matter which one we use.

35
testing/mochitest/Makefile.in
Просмотреть файл

@ -51,6 +51,19 @@ DIRS = MochiKit \
ssltunnel \
$(NULL)
NO_JS_MANIFEST = 1
MOZ_CHROME_FILE_FORMAT = jar
DIST_FILES = install.rdf
# Used in install.rdf
USE_EXTENSION_MANIFEST = 1
XPI_NAME = mochijar
# we turn this off for UNIVERSAL_BINARY
CHROME_JAR = 1
include $(topsrcdir)/config/rules.mk
# We're installing to _tests/testing/mochitest, so this is the depth
# necessary for relative objdir paths.
@ -108,6 +121,9 @@ _HANDSHAKE_FILES = \
_DEST_DIR = $(DEPTH)/_tests/$(relativesrcdir)
libs::
(cd $(DIST)/xpi-stage && tar $(TAR_CREATE_FLAGS) - mochijar) | (cd $(_DEST_DIR) && tar -xf -)
libs:: $(_PYWEBSOCKET_FILES)
$(INSTALL) $(foreach f,$^,"$f") $(_DEST_DIR)/pywebsocket
@ -175,6 +191,25 @@ endif
PKG_STAGE = $(DIST)/test-package-stage
DIST_BIN = $(DIST)/bin
PKG_CHROMEJAR = $(PKG_STAGE)/mochitest/content/
ifdef CHROME_JAR
stage-chromejar:
$(NSINSTALL) -D $(PKG_CHROMEJAR)
cp -RL $(DEPTH)/_tests/testing/mochitest/browser $(PKG_CHROMEJAR)
cp -RL $(DEPTH)/_tests/testing/mochitest/chrome $(PKG_CHROMEJAR)
ifdef ACCESSIBILITY
cp -RL $(DEPTH)/_tests/testing/mochitest/a11y $(PKG_CHROMEJAR)
endif
@(cd $(PKG_STAGE)/mochitest && zip -r tests.jar content/)
@(rm -rf $(PKG_CHROMEJAR))
stage-package: stage-chromejar
endif
$(_DEST_DIR):
$(NSINSTALL) -D $@
stage-package:
$(NSINSTALL) -D $(PKG_STAGE)/mochitest && $(NSINSTALL) -D $(PKG_STAGE)/bin/plugins
@(cd $(DEPTH)/_tests/testing/mochitest/ && tar $(TAR_CREATE_FLAGS) - *) | (cd $(PKG_STAGE)/mochitest && tar -xf -)

18
testing/mochitest/browser-harness.xul
Просмотреть файл

@ -208,15 +208,31 @@
// Returns an array of browserTest objects for all the selected tests
function listTests() {
var baseURL = 'chrome://mochitests/content';
var testsURI = Components.classes["@mozilla.org/file/directory_service;1"]
.getService(Components.interfaces.nsIProperties)
.get("ProfD", Components.interfaces.nsILocalFile);
testsURI.append("tests.manifest");
var ioSvc = Components.classes["@mozilla.org/network/io-service;1"].
getService(Components.interfaces.nsIIOService);
var manifestFile = ioSvc.newFileURI(testsURI)
.QueryInterface(Components.interfaces.nsIFileURL).file;
Components.manager.QueryInterface(Components.interfaces.nsIComponentRegistrar).
autoRegister(manifestFile);
// load server.js in so we can share template functions
var scriptLoader = Cc["@mozilla.org/moz/jssubscript-loader;1"].
getService(Ci.mozIJSSubScriptLoader);
var srvScope = {};
var baseURL = 'chrome://mochikit/content';
scriptLoader.loadSubScript('chrome://mochikit/content/server.js', srvScope);
var jar = getJar(baseURL);
if (jar != null) {
var [links, singleTestPath] = getMochitestJarListing(baseURL, gConfig.testPath, "browser");
} else {
var [links, singleTestPath] = getFileListing(baseURL, gConfig.testPath, "browser", srvScope);
}
var fileNames = [];
var fileNameRegexp = /browser_.+\.js$/;

17
testing/mochitest/chrome-harness.js
Просмотреть файл

@ -108,6 +108,9 @@ function getMochitestJarListing(basePath, testPath, dir)
var fileName = fileHandler.getFileFromURLSpec(getResolvedURI(basePath).JARFile.spec);
zReader.open(fileName);
//hardcoded 'content' as that is the root dir in the mochikit.jar file
var idx = basePath.indexOf('/content');
var basePath = basePath.slice(0, idx);
var base = "content/" + dir + "/";
var singleTestPath;
@ -119,7 +122,7 @@ function getMochitestJarListing(basePath, testPath, dir)
if (pathEntry.isDirectory) {
base = pathToCheck;
} else {
singleTestPath = '/' + base + testPath;
singleTestPath = basePath + '/' + base + testPath;
var singleObject = {};
singleObject[singleTestPath] = true;
return [singleObject, singleTestPath];
@ -129,7 +132,7 @@ function getMochitestJarListing(basePath, testPath, dir)
base = pathToCheck + "/";
}
}
var [links, count] = zList(base, zReader, true);
var [links, count] = zList(base, zReader, basePath, true);
return [links, null];
}
@ -143,7 +146,7 @@ function getMochitestJarListing(basePath, testPath, dir)
* returns:
* [json object of {dir:{subdir:{file:true, file:true, ...}}}, count of tests]
*/
function zList(base, zReader, recurse) {
function zList(base, zReader, baseJarName, recurse) {
var dirs = zReader.findEntries(base + "*");
var links = {};
var count = 0;
@ -162,12 +165,12 @@ function zList(base, zReader, recurse) {
var myFile = fileArray[i];
if (myFile.substr(-1) === '/' && recurse) {
var childCount = 0;
[links[myFile], childCount] = zList(myFile, zReader, recurse);
[links[myFile], childCount] = zList(myFile, zReader, baseJarName, recurse);
count += childCount;
} else {
if (myFile.indexOf("SimpleTest") == -1) {
//we add the '/' so we don't try to run content/content/chrome
links['/' + myFile] = true;
links[baseJarName + '/' + myFile] = true;
}
}
}
@ -283,7 +286,7 @@ function extractJarToTmp(jar) {
tmpdir.append("mochikit.tmp");
// parseInt is used because octal escape sequences cause deprecation warnings
// in strict mode (which is turned on in debug builds)
tmpdir.createUnique(Components.interfaces.nsIFile.DIRECTORY_TYPE, parseInt("0777", 8));
tmpdir.createUnique(Components.interfaces.nsIFile.DIRECTORY_TYPE, 0777);
var zReader = Components.classes["@mozilla.org/libjar/zip-reader;1"].
createInstance(Components.interfaces.nsIZipReader);
@ -311,7 +314,7 @@ function extractJarToTmp(jar) {
var targetDir = buildRelativePath(dirs.getNext(), tmpdir, filepath);
// parseInt is used because octal escape sequences cause deprecation warnings
// in strict mode (which is turned on in debug builds)
targetDir.create(Components.interfaces.nsIFile.DIRECTORY_TYPE, parseInt("0777", 8));
targetDir.create(Components.interfaces.nsIFile.DIRECTORY_TYPE, 0777);
}
//now do the files

81
testing/mochitest/harness-overlay.xul
Просмотреть файл

@ -17,65 +17,49 @@
src="chrome://mochikit/content/tests/SimpleTest/quit.js" />
<script type="text/javascript"
src="chrome://mochikit/content/tests/SimpleTest/setup.js" />
<script type="application/javascript"
src="chrome://mochikit/content/chrome-harness.js" />
<script type="application/javascript;version=1.7"><![CDATA[
function loadTests()
{
function loadTests()
{
window.removeEventListener("load", loadTests, false);
var dir = document.documentElement.getAttribute('directory');
var url = "chrome://mochikit/content/" + dir + "/";
// Find our chrome dir
var ios = Cc["@mozilla.org/network/io-service;1"].
getService(Ci.nsIIOService);
var chromeURI = ios.newURI("chrome://mochikit/content/",
null, null);
var resolvedURI = Cc["@mozilla.org/chrome/chrome-registry;1"].
getService(Ci.nsIChromeRegistry).
convertChromeURL(chromeURI);
var fileHandler = Cc["@mozilla.org/network/protocol;1?name=file"].
getService(Ci.nsIFileProtocolHandler);
var chromeDir = fileHandler.getFileFromURLSpec(resolvedURI.spec);
chromeDir = chromeDir.parent.QueryInterface(Ci.nsILocalFile);
chromeDir.appendRelativePath(dir);
var baseurl = 'chrome://mochitests/content';
var testsURI = Components.classes["@mozilla.org/file/directory_service;1"]
.getService(Components.interfaces.nsIProperties)
.get("ProfD", Components.interfaces.nsILocalFile);
testsURI.append("tests.manifest");
var ioSvc = Components.classes["@mozilla.org/network/io-service;1"].
getService(Components.interfaces.nsIIOService);
var manifestFile = ioSvc.newFileURI(testsURI)
.QueryInterface(Components.interfaces.nsIFileURL).file;
Components.manager.QueryInterface(Components.interfaces.nsIComponentRegistrar).
autoRegister(manifestFile);
var dir = document.documentElement.getAttribute('directory');
var singleTestPath;
if ("testPath" in params && params.testPath) {
var extraPath = params.testPath;
var pathToCheck = chromeDir.clone().QueryInterface(Ci.nsILocalFile);
var pathIsFile = false;
try {
var pathParts = extraPath.toString().split("/");
for each (var part in pathParts) {
pathToCheck.append(part);
}
if (pathToCheck.isDirectory()) {
for each (var part in pathParts) {
chromeDir.append(part);
}
url += extraPath + "/";
}
else {
pathIsFile = true;
}
}
catch (e) {
pathIsFile = true;
}
if (pathIsFile) {
singleTestPath = url + params.testPath;
}
}
// load server.js in so we can share template functions
var scriptLoader = Cc["@mozilla.org/moz/jssubscript-loader;1"].
getService(Ci.mozIJSSubScriptLoader);
var srvScope = {};
scriptLoader.loadSubScript("chrome://mochikit/content/server.js",
scriptLoader.loadSubScript('chrome://mochikit/content/server.js',
srvScope);
// generate our test list
srvScope.makeTags();
var [links, count] = srvScope.list(url, chromeDir, true);
var singleTestPath;
var links;
if (getResolvedURI(baseurl).JARFile) {
[links, singleTestPath] = getMochitestJarListing(baseurl, params.testPath, dir);
} else {
[links, singleTestPath] = getFileListing(baseurl, params.testPath, dir, srvScope);
}
var tableContent = srvScope.linksToTableRows(links, 0);
function populate() {
$("test-table").innerHTML += tableContent;
}
@ -83,10 +67,9 @@
populate();
hookup();
// if we got passed a test path, just run that single test
if (singleTestPath)
window.location.href = singleTestPath;
}
}
window.addEventListener("load", loadTests, false);
]]>

23
testing/mochitest/install.rdf Normal file
Просмотреть файл

@ -0,0 +1,23 @@
<?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>mochikit@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>Mochitest</em:name>
<em:description>Mochikit test harness</em:description>
<em:creator>Joel Maher</em:creator>
</Description>
</RDF>

39
testing/mochitest/jar.mn Normal file
Просмотреть файл

@ -0,0 +1,39 @@
mochikit.jar:
% content mochikit %content/
content/browser-harness.xul (browser-harness.xul)
content/browser-test.js (browser-test.js)
content/browser-test-overlay.xul (browser-test-overlay.xul)
content/chrome-harness.js (chrome-harness.js)
content/harness-a11y.xul (harness-a11y.xul)
content/harness-overlay.xul (harness-overlay.xul)
content/harness.xul (harness.xul)
content/ipc.js (ipc.js)
content/ipc-overlay.xul (ipc-overlay.xul)
content/mozprefs.js (mozprefs.js)
content/redirect-a11y.html (redirect-a11y.html)
content/redirect.html (redirect.html)
content/redirect.js (redirect.js)
content/server.js (server.js)
content/dynamic/getMyDirectory.sjs (dynamic/getMyDirectory.sjs)
content/static/bug100533_iframe.html (static/bug100533_iframe.html)
content/static/bug100533_load.html (static/bug100533_load.html)
content/static/bug277724_iframe1.html (static/bug277724_iframe1.html)
content/static/bug277724_iframe2.xhtml (static/bug277724_iframe2.xhtml)
content/static/bug340800_iframe.txt (static/bug340800_iframe.txt)
content/static/bug344830_testembed.svg (static/bug344830_testembed.svg)
content/static/harness.css (static/harness.css)
content/static/nnc_lockup.gif (static/nnc_lockup.gif)
content/tests/SimpleTest/EventUtils.js (tests/SimpleTest/EventUtils.js)
content/tests/SimpleTest/MozillaFileLogger.js (tests/SimpleTest/MozillaFileLogger.js)
content/tests/SimpleTest/PluginUtils.js (tests/SimpleTest/PluginUtils.js)
content/tests/SimpleTest/quit.js (tests/SimpleTest/quit.js)
content/tests/SimpleTest/setup.js (tests/SimpleTest/setup.js)
content/tests/SimpleTest/SimpleTest.js (tests/SimpleTest/SimpleTest.js)
content/tests/SimpleTest/test.css (tests/SimpleTest/test.css)
content/tests/SimpleTest/TestRunner.js (tests/SimpleTest/TestRunner.js)
content/tests/SimpleTest/WindowSnapshot.js (tests/SimpleTest/WindowSnapshot.js)
content/tests/SimpleTest/mockObjects.js (../../toolkit/content/tests/browser/common/mockObjects.js)
content/tests/SimpleTest/docshell_helpers.js (../..//docshell/test/chrome/docshell_helpers.js)
content/MochiKit/packed.js (MochiKit/packed.js)

56
testing/mochitest/runtests.py.in
Просмотреть файл

@ -42,6 +42,7 @@
Runs the Mochitest test harness.
"""
from __future__ import with_statement
from datetime import datetime
import optparse
import os
@ -343,7 +344,7 @@ class MochitestServer:
c.close()
rtncode = self._process.poll()
if (rtncode == None):
if rtncode is None:
self._process.terminate()
except:
self._process.kill()
@ -568,16 +569,18 @@ class Mochitest(object):
self.leak_report_file = os.path.join(options.profilePath, "runtests_leaks.log")
browserEnv = self.buildBrowserEnv(options)
if (browserEnv == None):
if browserEnv is None:
return 1
manifest = self.buildProfile(options)
if manifest is None:
return 1
self.startWebServer(options)
self.startWebSocketServer(options)
testURL = self.buildTestPath(options)
self.buildURLOptions(options)
if (len(self.urlOpts) > 0):
if len(self.urlOpts) > 0:
testURL += "?" + "&".join(self.urlOpts)
# Remove the leak detection file so it can't "leak" to the tests run.
@ -615,6 +618,7 @@ class Mochitest(object):
processLeakLog(self.leak_report_file, options.leakThreshold)
self.automation.log.info("\nINFO | runtests.py | Running tests: end.")
if manifest is not None:
self.cleanup(manifest, options)
return status
@ -673,27 +677,53 @@ toolbar#nav-bar {
temp_file = os.path.join(tempfile.mkdtemp(), "mochikit.manifest")
manifestFile = open(temp_file, "w")
manifestFile.write("content mochikit " + chrometestDir + " contentaccessible=yes\n")
browser_chrome = ""
if options.browserChrome:
manifestFile.write("""overlay chrome://navigator/content/navigator.xul chrome://mochikit/content/browser-test-overlay.xul
browser_chrome = """overlay chrome://navigator/content/navigator.xul chrome://mochikit/content/browser-test-overlay.xul
overlay chrome://browser/content/browser.xul chrome://mochikit/content/browser-test-overlay.xul
""")
elif ((options.chrome == False) and (options.a11y == False)):
"""
elif (options.chrome == False) and (options.a11y == False):
#only do the ipc-overlay.xul for mochitest-plain.
#Currently there are focus issues in chrome tests and issues with new windows and dialogs when using ipc
manifestFile.write("overlay chrome://browser/content/browser.xul chrome://mochikit/content/ipc-overlay.xul")
browser_chrome += "overlay chrome://browser/content/browser.xul chrome://mochikit/content/ipc-overlay.xul\n"
jarDir = 'mochijar'
if not os.path.exists(os.path.join(self.SCRIPT_DIRECTORY, jarDir)):
print "TEST-UNEXPECTED-FAIL | invalid setup: missing mochikit extension"
return None
if self.installTestsJar(options):
manifestFile.write("content mochitests jar:tests.jar!/content/\n");
else:
manifestFile.write("content mochitests %s contentaccessible=yes\n" % chrometestDir)
self.installChromeJar(jarDir, browser_chrome, options)
manifestFile.close()
return self.installChromeFile(temp_file, options)
def installChromeJar(self, jarDirName, browser_chrome, options):
"""
copy mochijar directory to profile as an extension so we have chrome://mochikit for all harness code
"""
jarDir = os.path.join(options.profilePath, 'extensions', 'mochikit@mozilla.org')
shutil.copytree(os.path.join(self.SCRIPT_DIRECTORY, jarDirName), jarDir)
with open(os.path.join(jarDir, "chrome.manifest"), 'a') as mfile:
mfile.write(browser_chrome)
return jarDir
def installTestsJar(self, options):
""" copy tests.jar to the profile directory so we can auto register it in the .xul harness """
if os.path.exists(os.path.join(self.SCRIPT_DIRECTORY, 'tests.jar')):
shutil.copy(os.path.join(self.SCRIPT_DIRECTORY, 'tests.jar'), options.profilePath)
return True
return False
def installChromeFile(self, filename, options):
(path, leaf) = os.path.split(options.app)
manifestdir = os.path.join(path, "distribution", "bundles", "mochitest")
if not os.path.exists(manifestdir):
os.makedirs(manifestdir)
manifest = os.path.join(manifestdir, "chrome.manifest")
""" copy tests.manifest to the profile directory so we can auto register with tests.jar """
manifest = os.path.join(options.profilePath, 'tests.manifest')
shutil.copy(filename, manifest)
return manifest

1
testing/mochitest/tests/SimpleTest/Makefile.in
Просмотреть файл

@ -55,6 +55,7 @@ _SIMPLETEST_FILES = MozillaFileLogger.js \
WindowSnapshot.js \
PluginUtils.js \
$(DEPTH)/toolkit/content/tests/browser/common/mockObjects.js \
$(DEPTH)/docshell/test/chrome/docshell_helpers.js \
$(NULL)
libs:: $(_SIMPLETEST_FILES)

7
testing/testsuite-targets.mk
Просмотреть файл

@ -142,8 +142,13 @@ PKG_STAGE = $(DIST)/universal/test-package-stage
endif
package-tests:
$(NSINSTALL) -D $(DIST)/$(PKG_PATH)
@rm -f "$(DIST)/$(PKG_PATH)$(TEST_PACKAGE)"
ifndef UNIVERSAL_BINARY
$(NSINSTALL) -D $(DIST)/$(PKG_PATH)
else
#building tests.jar (bug 543800) fails on unify, so we build tests.jar after unify is run
$(MAKE) -C $(DEPTH)/testing/mochitest stage-chromejar PKG_STAGE=$(DIST)/universal
endif
cd $(PKG_STAGE) && \
zip -r9D "$(call core_abspath,$(DIST)/$(PKG_PATH)$(TEST_PACKAGE))" *