X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;ds=sidebyside;f=build%2Ftest%2Fdata%2Ftestrunner.js;h=06d12cb291182ac7cdc54e16bf0639d2a3d00380;hb=797ccbaf3185e501a52b5a3517126fdbab03764c;hp=a72a1c17c883b367be73ef3a9d7573791dd4c66c;hpb=b0c3711d3e8bd844d1cfa8569864df1c1f73180a;p=jquery.git
diff --git a/build/test/data/testrunner.js b/build/test/data/testrunner.js
index a72a1c1..06d12cb 100644
--- a/build/test/data/testrunner.js
+++ b/build/test/data/testrunner.js
@@ -8,6 +8,7 @@ var stats = {
};
var queue = [];
var blocking = false;
+var timeout;
function synchronize(callback) {
queue[queue.length] = callback;
@@ -26,9 +27,11 @@ function process() {
function stop() {
blocking = true;
- setTimeout(start, asyncTimeout * 1000);
+ timeout = setTimeout(start, asyncTimeout * 1000);
}
function start() {
+ if(timeout)
+ clearTimeout(timeout);
blocking = false;
process();
}
@@ -40,19 +43,21 @@ function runTest(tests) {
synchronize(function() {
var runTime = new Date() - startTime;
var result = document.createElement("div");
- result.innerHTML = 'Tests completed in ' + runTime + ' milliseconds.
' +
- stats.bad + ' tests of ' + stats.all + ' failed.';
+ result.innerHTML = ['
Tests completed in ',
+ runTime, ' milliseconds.
',
+ stats.bad, ' tests of ', stats.all, ' failed.