+ <script + + language="javascript" + language="javascript1.1" + language="javascript1.2" + language="javascript1.3" + language="javascript1.4" + language="javascript1.5" + type="text/javascript" + type="text/javascript;version=1.1" + type="text/javascript;version=1.2" + type="text/javascript;version=1.3" + type="text/javascript;version=1.4" + type="text/javascript;version=1.5" + > + DOCTYPE + + Quirks + Standards + + Output Format + + HTML + JavaScript + + Failures only + +
'); + + writer.writeln('# Created ' + new Date()); + + for (suiteName in suites) + { + writer.writeln('# ' + suiteName + ': ' + + elements['SUMMARY_' + suiteName].value); + } + + writer.writeln('# TOTAL: ' + elements['TOTAL'].value); + + for (suiteName in suites) + { + var testDirs = suites[suiteName].testDirs; + for (var testDirName in testDirs) + { + var tests = testDirs[testDirName].tests; + for (var testName in tests) + { + var radioName = tests[testName].id; + var radio = elements[radioName]; + if (radio.checked) + writer.writeln(suiteName + '/' + testDirName + '/' + radio.value); + } + } + } + writer.writeln('<\/pre>'); + + writer.close(); +} + +var gTests; +var gTestNumber; +var gWindow; + +function executeList() +{ + var elements = document.forms['testCases'].elements; + + gTests = []; + gTestNumber = -1; + + for (var suiteName in suites) + { + var testDirs = suites[suiteName].testDirs; + for (var testDirName in testDirs) + { + var tests = testDirs[testDirName].tests; + for (var testName in tests) + { + var test = tests[testName]; + var radioName = test.id; + var radio = elements[radioName]; + delete test.testCases; + if (radio.checked) + { + gTests[gTests.length] = test; + test.path = suiteName + '/' + testDirName + '/' + radio.value; + } + } + } + } + runNextTest(); +} + +function runNextTest() +{ + var iTestCase; + + if (gTestNumber != -1) + { + // tests have already run in gWindow, collect the results + // for later reporting. + + var e; + try + { + var test = gTests[gTestNumber]; + test.testCases = []; + //test.testCases = test.testCases.concat(gWindow.testcases); + // note MSIE6 has a bug where instead of concating the new arrays + // it concats them to the first element. work around... + var origtestcases = gWindow.testcases; + for (iTestCase = 0; iTestCase < origtestcases.length; iTestCase++) + { +// test.testCases[test.testCases.length] = origtestcases[iTestCase]; + var origtestcase = origtestcases[iTestCase]; + var testCase = test.testCases[test.testCases.length] = {}; + testCase.name = new String(origtestcase.name); + testCase.description = new String(origtestcase.description); + testCase.expect = new String(origtestcase.expect); + testCase.actual = new String(origtestcase.actual); + testCase.passed = origtestcase.passed ? true : false; + testCase.reason = new String(origtestcase.reason); + testCase.bugnumber = new String(origtestcase.bugnumber?origtestcase.bugnumber:''); + } + origtestcases = origtestcase = null; + } + catch(e) + { + ; + } + } + + ++gTestNumber; + + if (gTestNumber < gTests.length) + { + // run test + test = gTests[gTestNumber]; + + gWindow = window.open('js-test-driver-' + + document.forms.testCases.doctype.value + + '.html?test=' + + test.path + + ';language=' + + document.forms.testCases.language.value, + 'output'); + if (!gWindow) + { + alert('This test suite requires popup windows.\n' + + 'Please enable them for this site.'); + } + } + else if (document.forms.testCases.outputformat.value == 'html') + { + // all tests completed, display report + reportHTML(); + } + else if (document.forms.testCases.outputformat.value == 'javascript') + { + // all tests completed, display report + reportJavaScript(); + } + +} + +function reportHTML() +{ + var errorsOnly = document.forms.testCases.failures.checked; + var totalTestCases = 0; + var totalTestCasesPassed = 0; + var totalTestCasesFailed = 0; + + gWindow.document.close(); + + var writer = new CachedWriter(gWindow.document); + + writer.writeln(''); + + writer.writeln(''); + writer.writeln(''); + writer.writeln('JavaScript Tests Browser: ' + + navigator.userAgent + ' Language: ' + + document.forms.testCases.language.value + + '<\/title>'); + writer.writeln('<style type="text/css">'); + writer.writeln(' .passed { } .failed { background-color: red; }'); + writer.writeln('table {}'); + writer.writeln('th.description, th.actual, th.expect { width: 30em;}'); + writer.writeln('<\/style>'); + + writer.writeln('<\/head>'); + writer.writeln('<body>'); + writer.writeln('<h2>JavaScript Tests Browser: ' + + navigator.userAgent + ' Language: ' + + document.forms.testCases.language.value + + '<\/h2>'); + + writer.writeln('<table border="1">'); + writer.writeln('<thead>'); + writer.writeln('<tr>'); + writer.writeln('<th>Suite<\/th>'); + writer.writeln('<th>Directory<\/th>'); + writer.writeln('<th>Test<\/th>'); + writer.writeln('<th>Passed<\/th>'); + writer.writeln('<th class="description">Description<\/th>'); + writer.writeln('<th class="actual">Actual<\/th>'); + writer.writeln('<th class="expect">Expect<\/th>'); + writer.writeln('<th>BugNumber<\/th>'); + writer.writeln('<th>Reason<\/th>'); + writer.writeln('<\/tr>'); + writer.writeln('<\/thead>'); + writer.writeln('<tbody>'); + + writer.writeln('<\/tr>'); + + for (var suiteName in suites) + { + var suiteTotals = {passed: 0, failed: 0}; + var testDirs = suites[suiteName].testDirs; + + for (var testDirName in testDirs) + { + var dirTotals = {passed: 0, failed: 0}; + var tests = testDirs[testDirName].tests; + + for (var testName in tests) + { + var nameTotals = {passed: 0, failed: 0}; + var test = tests[testName]; + + if (! ('testCases' in test) ) + { + // test not run + continue; + } + + var testCases = test.testCases; + + for (var iTestCase = 0; iTestCase < testCases.length; iTestCase++) + { + var testCase = testCases[iTestCase]; + ++totalTestCases; + if (testCase.passed) + { + ++totalTestCasesPassed; + ++nameTotals.passed; + ++dirTotals.passed; + ++suiteTotals.passed; + } + else + { + ++totalTestCasesFailed; + ++nameTotals.failed; + ++dirTotals.failed; + ++suiteTotals.failed; + } + + if (errorsOnly && testCase.passed) + { + continue; + } + + writer.writeln('<tr class="' + + (testCase.passed ? 'passed' : 'failed') + '">' + + '<td title="Suite">' + suiteName + '<\/td>' + + '<td title="Directory">' + testDirName + '<\/td>' + + '<td title="Test">' + testName + '<\/td>' + + '<td title="Status">' + + (testCase.passed ? 'Test Passed':'Test Failed') + + '<\/td>' + + '<td title="Description">' + + splitString(testCase.description, '<br>', 30) + + '<\/td>' + + '<td title="Actual">' + + splitString(testCase.actual, '<br>', 30) + + '<\/td>' + + '<td title="Expected">' + + splitString(testCase.expect, '<br>', 30) + + '<\/td>' + + '<td title="Bug">' + + (testCase.bugnumber?testCase.bugnumber:'') + + '<\/td>' + + '<td title="Reason">' + testCase.reason + '<\/td>' + + '<\/tr>'); + } // for iTestCase + + if (!errorsOnly && nameTotals.passed + nameTotals.failed > 0) + { + writer.writeln('<tr>' + + '<td>' + suiteName + '<\/td>' + + '<td>' + testDirName + '<\/td>' + + '<td colspan="7" style="font-weight:bold;">' + + testName + ' ' + + 'Passed = ' + nameTotals.passed.toString() + ' ' + + 'Failed = ' + nameTotals.failed.toString() + + '<\/td>' + + '<\/tr>'); + } + + } // for (var testName in tests) + + if (!errorsOnly && dirTotals.passed + dirTotals.failed > 0) + { + writer.writeln('<tr>' + + '<td>' + suiteName + '<\/td>' + + '<td colspan="8" style="font-weight:bold;">' + + testDirName + ' ' + + 'Passed = ' + dirTotals.passed.toString() + ' ' + + 'Failed = ' + dirTotals.failed.toString() + + '<\/td>' + + '<\/tr>'); + } + + } // for (var testDirName in testDirs) + + if (!errorsOnly && suiteTotals.passed + suiteTotals.failed > 0) + { + writer.writeln('<tr>' + + '<td colspan="9" style="font-weight:bold;">' + + suiteName + ' ' + + 'Passed = ' + suiteTotals.passed.toString() + ' ' + + 'Failed = ' + suiteTotals.failed.toString() + + '<\/td>' + + '<\/tr>'); + } + + } // for (var suiteName in suites) + + writer.writeln('<\/tbody>'); + writer.writeln('<\/table>'); + + writer.writeln('<p>Total TestCases = ' + totalTestCases + + ', Passed = ' + totalTestCasesPassed + + ', Failed = ' + totalTestCasesFailed + + '<\/p>'); + writer.writeln('<\/body>'); + writer.writeln('<\/html>'); + + writer.close(); +} + +// return a string with delim inserted every pos characters +// if there are no spaces to break the line +function splitString(str, delim, pos) +{ + var newstr = ''; + var length = str.length; + + if (str.indexOf(' ') != -1) + { + return str; + } + for (var i = 0; i < length; i += pos) + { + newstr += str.substr(i, pos) + delim; + } + return newstr; +} +function reportJavaScript() +{ + gWindow.document.close(); + + var errorsOnly = document.forms.testCases.failures.checked; + var writer = new CachedWriter(gWindow.document); + + writer.writeln('<html>'); + writer.writeln('<head>'); + writer.writeln('<title>JavaScript Tests Browser: ' + + navigator.userAgent + ' Language: ' + + document.forms.testCases.language.value + + '<\/title>'); + writer.writeln('<script type="text/javascript">'); + writer.writeln('var global = window.parent;'); + writer.writeln('if (!global.gUAHash) {'); + writer.writeln(' global.gUAHash = {};'); + writer.writeln(' global.gUAList = {};'); + writer.writeln(' global.gUA_id = -1;'); + writer.writeln(' global.gTestResults = {};'); + writer.writeln('}'); + writer.writeln('var gUA = "' + navigator.userAgent + '";'); + writer.writeln('var gUA_id = global.gUAHash[gUA];'); + writer.writeln('if (typeof(gUA_id) != "number") {'); + writer.writeln(' gUA_id = global.gUAHash[gUA] = ++global.gUA_id;'); + writer.writeln(' global.gUAList[gUA_id] = gUA;'); + writer.writeln('}'); + writer.writeln('var gTestResults = global.gTestResults;'); + writer.writeln('var gLanguage = \'' + document.forms.testCases.language.value + '\';'); + writer.writeln('var gResult;'); + writer.writeln('var gResultId;'); + writer.writeln('var gUAResult;'); + writer.writeln('var gJSResult;'); + writer.writeln('var gSuiteId;'); + writer.writeln('var gSuite;'); + writer.writeln('var gDirId;'); + writer.writeln('var gDir;'); + writer.writeln('var gTestId;'); + writer.writeln('var gTest;'); + + writer.writeln('gUAResult = gTestResults[gUA_id];'); + writer.writeln('if (!gUAResult) {'); + writer.writeln(' gUAResult = gTestResults[gUA_id] = {};'); + writer.writeln('}'); + writer.writeln('gJSResult = gUAResult[gLanguage];'); + writer.writeln('if (!gJSResult) {'); + writer.writeln(' gJSResult = gUAResult[gLanguage] = {};'); + writer.writeln('}'); + + + for (var suiteName in suites) + { + var suiteheader = ''; + + suiteheader += 'gSuiteId = "' + suiteName + '";\n'; + suiteheader += 'gSuite = gJSResult[gSuiteId];\n'; + suiteheader += 'if (!gSuite) {\n'; + suiteheader += ' gSuite = gJSResult[gSuiteId] = {};\n'; + suiteheader += '}\n'; + + var testDirs = suites[suiteName].testDirs; + + for (var testDirName in testDirs) + { + var dirheader = ''; + + dirheader += 'gDirId = "' + testDirName + '";\n'; + dirheader += 'gDir = gSuite[gDirId];\n'; + dirheader += 'if (!gDir) {\n'; + dirheader += ' gDir = gSuite[gDirId] = {};\n'; + dirheader += '}\n'; + + var tests = testDirs[testDirName].tests; + + for (var testName in tests) + { + var test = tests[testName]; + + if (! ('testCases' in test) ) + { + // test not run + continue; + } + + var testCases = test.testCases; + var resultId = suiteName + '/' + testDirName + '/' + testName; + + var testheader = ''; + testheader += 'gTestId = "' + testName + '";\n'; + testheader += 'gTest = gDir[gTestId];\n'; + testheader += 'if (!gTest) {\n'; + testheader += ' gTest = gDir[gTestId] = [];\n'; + testheader += '}\n'; + + for (var iTestCase = 0; iTestCase < testCases.length; iTestCase++) + { + var testCase = testCases[iTestCase]; + if (errorsOnly && testCase.passed) + { + continue; + } + + if (suiteheader) + { + writer.writeln(suiteheader); + suiteheader = ''; + } + if (dirheader) + { + writer.writeln(dirheader); + dirheader = ''; + } + if (testheader) + { + writer.writeln(testheader); + testheader = ''; + } + + var name = escape(testCase.name); + var desc = escape(testCase.description); + var actual = escape(testCase.actual); + var expect = escape(testCase.expect); + var reason = escape(testCase.reason); + + var buffer = ''; + + buffer += 'gTest[gTest.length] = \n'; + buffer += '{\n'; + buffer += 'name: "' + name + '",\n'; + buffer += 'description: "' + desc + '",\n'; + buffer += 'expect: "' + expect + '",\n'; + buffer += 'actual: "' + actual + '",\n'; + buffer += 'passed: ' + testCase.passed + ',\n'; + buffer += 'reason: "' + reason + '",\n'; + buffer += 'bugnumber: "' + (testCase.bugnumber ? + testCase.bugnumber : '') + '"\n'; + buffer += '};\n'; + + writer.writeln(buffer); + buffer = ''; + + } // for iTestCase + + } // for testName + + } // for testDirName + + } // for (var suiteName in suites) + + writer.writeln('<\/script>'); + writer.writeln('<\/head>'); + writer.writeln('<body>'); + writer.writeln('<p>JavaScript Tests Browser: ' + + navigator.userAgent + ' Language: ' + + document.forms.testCases.language.value + + '<\/p>'); + writer.writeln('<\/body>') + writer.writeln('<\/html>'); + writer.close(); +} + +// improve IE's performance. Mozilla's is fine. ;-) +function CachedWriter(doc, limit) +{ + this.document = doc; + this.pendingCount = 0; + this.pendingLimit = limit ? limit : 100; + this.lines = []; +} + +CachedWriter.prototype.destroy = function _cachedWriterDestroy() +{ + this.document = null; + this.pendingCount = 0; + this.pendingLimit = 0; + this.lines = null; +} + +CachedWriter.prototype.writeln = function _cachedWriterWriteLine(s) +{ + this.lines[this.lines.length] = s; + if (++this.pendingCount >= this.pendingLimit) + { + this.flush(); + } +} + +CachedWriter.prototype.flush = function _cachedWriterFlush() +{ + var s = this.lines.join('\n'); + this.pendingCount = 0; + this.lines = []; + if (!window.opera) + { + for (var ibadchar = 0; ibadchar < 32; ++ibadchar) + { + if (ibadchar != 10 && ibadchar != 13) + { + var badchar = String.fromCharCode(ibadchar); + var badregx = new RegExp(badchar, 'mg'); + var escchar = '\\0x' + ibadchar.toString(16); + s = s.replace(badregx, escchar); + } + } + } + this.document.writeln(s); +} + +CachedWriter.prototype.close = function _cachedWriterClose() +{ + this.flush(); + this.document.close(); + this.destroy(); +} diff --git a/mozilla/js/tests/mklistpage.pl b/mozilla/js/tests/mklistpage.pl index 70bb34f9784..592c229e9cf 100644 --- a/mozilla/js/tests/mklistpage.pl +++ b/mozilla/js/tests/mklistpage.pl @@ -22,6 +22,7 @@ # # Contributor(s): # Robert Ginda +# Bob Clary # # Alternatively, the contents of this file may be used under the terms of # either the GNU General Public License Version 2 or later (the "GPL"), or @@ -61,45 +62,59 @@ sub main { @suite_list = sort(&get_subdirs ($suite_path)); - $javascript .= "suites = new Object();\n"; + $javascript .= "\n"; + $javascript .= "var suites = {};\n"; + $javascript .= "function populateSuites()\n"; + $javascript .= "{\n"; + $javascript .= "var currSuite;\n"; + $javascript .= "var currDirectory;\n"; + $javascript .= "var currTestDirs;\n"; + $javascript .= "var currTests;\n"; $html .= "<h3>Test Suites:</h3>\n"; $html .= "<center>\n"; - $html .= " <input type='button' value='Select All' " . - "onclick='selectAll();'> "; - $html .= " <input type='button' value='Select None' " . - "onclick='selectNone();'> "; + $html .= "<input type='button' value='Select All' " . + "onclick='selectAll();'> \n"; + $html .= "<input type='button' value='Select None' " . + "onclick='selectNone();'> \n"; # suite menu - $html .= "<table border='1'>\n"; + $html .= "<table border='1' summary='suite menu'>\n"; foreach $suite (@suite_list) { local @readme_text = ("No description available."); if (open (README, $suite_path . $suite . "/README")) { @readme_text = <README>; close (README); } - $html .= "<tr><td><a href='\#SUITE_$suite'>$suite</a></td>" . - "<td>@readme_text</td>"; - $html .= "<td><input type='button' value='Select All' " . - "onclick='selectAll(\"$suite\");'> "; + $html .= "<tr>\n"; + $html .= "<td>\n"; + $html .= "<a href='\#SUITE_$suite'>$suite</a>\n"; + $html .= "</td>\n"; + $html .= "<td>@readme_text</td>\n"; + $html .= "<td>\n"; + $html .= "<input type='button' value='Select All' " . + "onclick='selectAll(\"$suite\");'> \n"; $html .= "<input type='button' value='Select None' " . - "onclick='selectNone(\"$suite\");'></td>"; + "onclick='selectNone(\"$suite\");'>\n"; + $html .= "</td>\n"; $html .= "<td><input readonly name='SUMMARY_$suite'></td>"; $html .= "</tr>"; } $html .= "</table>\n"; - $html .= "<td><input readonly name='TOTAL'></td>"; - $html .= "</center>"; - $html .= "<dl>\n"; + $html .= "<div><input readonly name='TOTAL'></div>\n"; + $html .= "</center>\n"; + $html .= "<dl>\n"; foreach $i (0 .. $#suite_list) { local $prev_href = ($i > 0) ? "\#SUITE_" . $suite_list[$i - 1] : ""; - local $next_href = ($i < $#suite_list) ? "\#SUITE_" . $suite_list[$i + 1] : ""; + local $next_href = ($i < $#suite_list) ? "\#SUITE_" . + $suite_list[$i + 1] : ""; &process_suite ($suite_path, $suite_list[$i], $prev_href, $next_href); } - $html .= "</dl>\n"; + $javascript .= "}\n"; + $javascript .= "populateSuites();\n"; } # @@ -109,60 +124,76 @@ sub main { sub process_suite { local ($suite_path, $suite, $prev_href, $next_href) = @_; local $i, @test_dir_list; + local $suite_count = 0; # suite js object - $javascript .= "suites[\"$suite\"] = {testDirs: {}};\n"; + $javascript .= "currSuite = suites[\"$suite\"] = " . + "{testDirs:{}, count:0, selected:0};\n"; + $javascript .= "currTestDirs = currSuite.testDirs;\n"; @test_dir_list = sort(&get_subdirs ($test_home . $suite)); # suite header - $html .= " <a name='SUITE_$suite'></a><hr><dt><big><big><b>$suite " . - "(" . ($#test_dir_list + 1) . " Sub-Categories)</b></big></big><br>\n"; - $html .= " <input type='button' value='Select All' " . - "onclick='selectAll(\"$suite\");'>\n"; - $html .= " <input type='button' value='Select None' " . - "onclick='selectNone(\"$suite\");'> " . - "[ <a href='\#top_of_page'>Top of page</a> "; + + $html .= "<dt>\n"; + $html .= "<a name='SUITE_$suite'></a>$suite " . + "(" . ($#test_dir_list + 1) . " Sub-Categories)\n"; + $html .= "<input type='button' value='Select All' " . + "onclick='selectAll(\"$suite\");'>\n"; + $html .= "<input type='button' value='Select None' " . + "onclick='selectNone(\"$suite\");'> \n"; + $html .= "[ "; + $html .= "<a href='\#top_of_page'>Top of page</a> \n"; if ($prev_href) { - $html .= " | <a href='$prev_href'>Previous Suite</a> "; + $html .= " | "; + $html .= "<a href='$prev_href'>Previous Suite</a> \n"; } if ($next_href) { - $html .= " | <a href='$next_href'>Next Suite</a> "; + $html .= " | "; + $html .= "<a href='$next_href'>Next Suite</a> \n"; } $html .= "]\n"; + $html .= "</dt>\n"; + $html .= "<dd>\n"; - $html .= " <dd>\n <dl>\n"; - foreach $i (0 .. $#test_dir_list) { - local $prev_href = ($i > 0) ? "\#TESTDIR_" . $suite . $test_dir_list[$i - 1] : - ""; + local $prev_href = ($i > 0) ? "\#TESTDIR_" . $suite . + $test_dir_list[$i - 1] : + ""; local $next_href = ($i < $#test_dir_list) ? "\#TESTDIR_" . $suite . $test_dir_list[$i + 1] : ""; - &process_test_dir ($suite_path . $suite . "/", $test_dir_list[$i], $suite, + &process_test_dir ($suite_path . $suite . "/", $test_dir_list[$i], + $suite, $prev_href, $next_href); } + $javascript .= "currSuite.count = $suite_count;\n"; - $html .= " </dl>\n"; - + $html .= "</dd>\n"; } # -# Append detail from a test directory, calling process_test for subordinate js files +# Append detail from a test directory, +# calling process_test for subordinate js files # sub process_test_dir { local ($test_dir_path, $test_dir, $suite, $prev_href, $next_href) = @_; @test_list = sort(&get_js_files ($test_dir_path . $test_dir)); - $javascript .= "suites[\"$suite\"].testDirs[\"$test_dir\"] = {tests: {}};\n"; + $suite_count += @test_list; - $html .= " <a name='TESTDIR_$suite$test_dir'></a>\n"; - $html .= " <dt><big><b>$test_dir (" . ($#test_list + 1) . - " tests)</b></big><br>\n"; - $html .= " <input type='button' value='Select All' " . - "onclick='selectAll(\"$suite\", \"$test_dir\");'>\n"; - $html .= " <input type='button' value='Select None' " . - "onclick='selectNone(\"$suite\", \"$test_dir\");'> "; + $javascript .= "currDirectory = currTestDirs[\"$test_dir\"] = " . + "{tests:{}};\n"; + $javascript .= "currTests = currDirectory.tests;\n"; + + $html .= "<dl>\n"; + $html .= "<dt>\n"; + $html .= "<a name='TESTDIR_$suite$test_dir'></a>\n"; + $html .= "$test_dir (" . ($#test_list + 1) . " tests)\n"; + $html .= "<input type='button' value='Select All' " . + "onclick='selectAll(\"$suite\", \"$test_dir\");'>\n"; + $html .= "<input type='button' value='Select None' " . + "onclick='selectNone(\"$suite\", \"$test_dir\");'> "; $html .= "[ <a href='\#SUITE_$suite'>Top of $suite Suite</a> "; if ($prev_href) { $html .= "| <a href='$prev_href'>Previous Category</a> "; @@ -170,16 +201,16 @@ sub process_test_dir { if ($next_href) { $html .= " | <a href='$next_href'>Next Category</a> "; } - $html .= "]<br>\n"; - $html .= " </dt>\n"; + $html .= "]\n"; + $html .= "</dt>\n"; - $html .= " <dl>\n"; + $html .= "<dd>\n"; foreach $test (@test_list) { &process_test ($test_dir_path . $test_dir, $test); } - $html .= " </dl>\n"; + $html .= "</dl>\n"; } @@ -196,25 +227,32 @@ sub process_test { die ("Error opening " . $test_dir_path . "/" . $test); while (<TESTCASE>) { - if (/.*TITLE\s+\=\s+\"(.*)\"/) { + if (/.*(TITLE|summary)\s+\=\s+[\"\'](.*)[\"\']/i) { + $title = $2; + break; + } + if (/.*START\([\"\'](.*)[\"\']\);/) + { $title = $1; break; } } close (TESTCASE); - $javascript .= "suites[\"$suite\"].testDirs[\"$test_dir\"].tests" . - "[\"$test\"] = \"radio$uid\"\n"; - $html .= " <input type='radio' value='$test' name='radio$uid' ". - "onclick='return onRadioClick(\"radio$uid\");'>" . - "<a href='$lxr_url$suite/$test_dir/$test' target='other_window'>" . - "$test</a> $title<br>\n"; + $javascript .= "currTests[\"$test\"] = {id:\"t$uid\"}\n"; + $html .= "<dd>\n"; + $html .= " <input type='checkbox' value='$test' name='t$uid' " . + "id='$suite:$test_dir:$test' ". + "onclick='return onRadioClick(this);'>\n"; + $html .= "<a href='$lxr_url$suite/$test_dir/$test' target='other_window'>" . + "$test</a> $title\n"; + $html .= "</dd>\n"; } sub scriptTag { - return ("<script langugage='JavaScript'>@_</script>"); + return ("<script type='text/javascript' language='JavaScript'>@_</script>"); } @@ -255,7 +293,7 @@ sub get_js_files { closedir( TEST_SUBDIR ); foreach ( @subdir_files ) { - if ( $_ =~ /\.js$/ ) { + if ( ($_ =~ /\.js$/) && ($_ ne 'shell.js') && ($_ ne 'browser.js') ) { $js_file_array[$#js_file_array+1] = $_; } } diff --git a/mozilla/js/tests/runRhinoTests.pl b/mozilla/js/tests/runRhinoTests.pl index e80ef9251bc..906323cab33 100644 --- a/mozilla/js/tests/runRhinoTests.pl +++ b/mozilla/js/tests/runRhinoTests.pl @@ -1,4 +1,4 @@ -#!/tools/ns/bin/perl5 +#!/usr/bin/perl5 # # simple script that executes JavaScript tests. you have to build the # stand-alone, js shell executable (which is not the same as the dll that gets diff --git a/mozilla/js/tests/runtests.pl b/mozilla/js/tests/runtests.pl index f6f05fb238f..7a4b2aefca9 100644 --- a/mozilla/js/tests/runtests.pl +++ b/mozilla/js/tests/runtests.pl @@ -1,4 +1,4 @@ -#!/tools/ns/bin/perl5 +#!/usr/bin/perl5 # # simple script that executes JavaScript tests. you have to build the # stand-alone, js shell executable (which is not the same as the dll that gets