X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=build%2Ftest%2Fdata%2Ftestrunner.js;h=e73fd671d096d67d7dae09b57d9589066cd9b4b3;hb=c6a893b68001be9b9389de5e2c5ea58c1a28c742;hp=0ff0ad50065266b9b5f2c6bfb019a69fb6562c5c;hpb=4c66f62a6fcc84a6c85249d0fb34b93edd40be00;p=jquery.git

diff --git a/build/test/data/testrunner.js b/build/test/data/testrunner.js
index 0ff0ad5..e73fd67 100644
--- a/build/test/data/testrunner.js
+++ b/build/test/data/testrunner.js
@@ -15,6 +15,8 @@ var _config = {
 
 $(function() {
 	$('#userAgent').html(navigator.userAgent);
+	if($.browser.safari)
+		$("h1").append(" - Slowed down for Safari to prevent crashes");
 	runTest();	
 });
 
@@ -63,9 +65,18 @@ function runTest() {
 	});
 }
 
-function test(name, callback) {
+function test(name, callback, nowait) {
+	// safari seems to have some memory problems, so we need to slow it down
+	if($.browser.safari && !nowait) {
+		test("", function() {
+			stop();
+			setTimeout(start, 250);
+		}, true);
+	}
+
 	if(_config.currentModule)
 		name = _config.currentModule + " module: " + name;
+		
 	synchronize(function() {
 		_config.Test = [];
 		try {
@@ -82,6 +93,9 @@ function test(name, callback) {
 	synchronize(function() {
 		reset();
 		
+		// don't output pause tests
+		if(nowait) return;
+		
 		if(_config.expected && _config.expected != _config.Test.length) {
 			_config.Test.push( [ false, "Expected " + _config.expected + " assertions, but " + _config.Test.length + " were run" ] );
 		}