wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge m-c to m-i.

Browse Source
This commit is contained in:
Richard Newman 2012-04-05 22:06:41 -07:00
commit ac3180fbf9
3 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
testing/mochitest/tests/SimpleTest/TestRunner.js
View File

@ -6,8 +6,8 @@
*/
function getElement(id) {
return ((typeof(id) == "string") ?
document.getElementById(id) : id);
};
document.getElementById(id) : id);
}
this.$ = this.getElement;
@ -29,7 +29,7 @@ function contentAsyncEvent(type, data) {
}
/* Helper Function */
function extend(obj, /* optional */skip) {
function extend(obj, /* optional */ skip) {
// Extend an array with an array-like object starting
// from the skip index
if (!skip) {
@ -43,7 +43,7 @@ function extend(obj, /* optional */skip) {
}
}
return ret;
};
}
function flattenArguments(lst/* ...*/) {
var res = [];
@ -59,7 +59,7 @@ function flattenArguments(lst/* ...*/) {
}
}
return res;
};
}
/**
* TestRunner: A test runner for SimpleTest
@ -91,7 +91,7 @@ TestRunner._timeoutFactor = 1;
TestRunner._checkForHangs = function() {
function reportError(win, msg) {
if ("SimpleTest" in win) {
win.SimpleTest.ok(false, "Test timed out.");
win.SimpleTest.ok(false, msg);
} else if ("W3CTest" in win) {
win.W3CTest.report({
"message": msg,
@ -100,6 +100,7 @@ TestRunner._checkForHangs = function() {
});
}
}
function killTest(win) {
if ("SimpleTest" in win) {
win.SimpleTest.finish();
@ -126,7 +127,9 @@ TestRunner._checkForHangs = function() {
reportError(frameWindow, "Skipping " + skippedTests + " remaining tests.");
}
killTest(frameWindow);
// Add a little (1 second) delay to ensure automation.py has time to notice
// "Test timed out" log and process it (= take a screenshot).
setTimeout(function delayedKillTest() { killTest(frameWindow); }, 1000);
if (TestRunner._haltTests)
return;
@ -373,7 +376,7 @@ TestRunner.runNextTest = function() {
if (TestRunner.repeat == 0 && TestRunner.onComplete) {
TestRunner.onComplete();
}
if (TestRunner._currentLoop < TestRunner.repeat) {
TestRunner._currentLoop++;
TestRunner.resetTests(TestRunner._urls);
@ -476,7 +479,7 @@ TestRunner.displayLoopErrors = function(tableName, tests) {
var curtest;
if (table.rows.length == 0) {
//if table headers are not yet generated, make them
var row = table.insertRow(table.rows.length);
var row = table.insertRow(table.rows.length);
var cell = row.insertCell(0);
var textNode = document.createTextNode("Test File Name:");
cell.appendChild(textNode);
@ -487,13 +490,13 @@ TestRunner.displayLoopErrors = function(tableName, tests) {
textNode = document.createTextNode("Error message:");
cell.appendChild(textNode);
}
//find the broken test
for (var testnum in tests){
curtest = tests[testnum];
if( !((curtest.todo && !curtest.result) || (curtest.result && !curtest.todo)) ){
//this is a failed test or the result of todo test. Display the related message
row = table.insertRow(table.rows.length);
row = table.insertRow(table.rows.length);
cell = row.insertCell(0);
textNode = document.createTextNode(TestRunner.currentTestURL);
cell.appendChild(textNode);

4
toolkit/mozapps/installer/packager.mk
View File

@ -562,9 +562,6 @@ endif
# For final GPG / authenticode signing / dmg signing if required
ifdef MOZ_EXTERNAL_SIGNING_FORMAT
MOZ_SIGN_PACKAGE_CMD=$(MOZ_SIGN_CMD) $(foreach f,$(MOZ_EXTERNAL_SIGNING_FORMAT),-f $(f))
ifeq (gpg,$(findstring gpg,$(MOZ_EXTERNAL_SIGNING_FORMAT)))
UPLOAD_EXTRA_FILES += $(PACKAGE).asc
endif
endif
ifdef MOZ_SIGN_PREPARED_PACKAGE_CMD
@ -975,6 +972,7 @@ CHECKSUM_FILES += $(CHECKSUM_FILE).asc
UPLOAD_FILES += $(call QUOTED_WILDCARD,$(DIST)/$(COMPLETE_MAR).asc)
UPLOAD_FILES += $(call QUOTED_WILDCARD,$(wildcard $(DIST)/$(PARTIAL_MAR).asc))
UPLOAD_FILES += $(call QUOTED_WILDCARD,$(INSTALLER_PACKAGE).asc)
UPLOAD_FILES += $(call QUOTED_WILDCARD,$(DIST)/$(PACKAGE).asc)
endif
endif

15
xpcom/tests/unit/test_bug325418.js
View File

@ -6,17 +6,16 @@ const start_time = (new Date()).getTime();
const expected_time = 1;
var observer = {
observe: function(subject, topic, data) {
observe: function observeTC(subject, topic, data) {
if (topic == "timer-callback") {
var stop_time = (new Date()).getTime();
// expected time may not be exact so convert to seconds and round down.
var result = Math.round((stop_time - start_time) / 1000);
do_check_true(result, expected_time);
do_test_finished();
timer.cancel();
timer = null;
// expected time may not be exact so convert to seconds and round down.
var result = Math.floor(((new Date()).getTime() - start_time) / 1000);
do_check_eq(result, expected_time);
do_test_finished();
}
}
};