diff --git a/mozilla/js/tests/Makefile b/mozilla/js/tests/Makefile new file mode 100644 index 00000000000..04f37b2dc77 --- /dev/null +++ b/mozilla/js/tests/Makefile @@ -0,0 +1,4 @@ + +testmenu: + exec perl5 mklistpage.pl > menubody.html + cat menuhead.html menubody.html menufoot.html > menu.html \ No newline at end of file diff --git a/mozilla/js/tests/menufoot.html b/mozilla/js/tests/menufoot.html new file mode 100644 index 00000000000..da7902e6775 --- /dev/null +++ b/mozilla/js/tests/menufoot.html @@ -0,0 +1,8 @@ + + + +
+
+ + + diff --git a/mozilla/js/tests/menuhead.html b/mozilla/js/tests/menuhead.html new file mode 100644 index 00000000000..e3a42a4e2b5 --- /dev/null +++ b/mozilla/js/tests/menuhead.html @@ -0,0 +1,138 @@ + + + + Core JavaScript Tests + + + + + + + +

Core JavaScript Tests

+ +
+ + diff --git a/mozilla/js/tests/mklistpage.pl b/mozilla/js/tests/mklistpage.pl new file mode 100644 index 00000000000..d72af2af47b --- /dev/null +++ b/mozilla/js/tests/mklistpage.pl @@ -0,0 +1,261 @@ +#!/usr/bin/perl +# +# The contents of this file are subject to the Netscape Public +# License Version 1.1 (the "License"); you may not use this file +# except in compliance with the License. You may obtain a copy of +# the License at http://www.mozilla.org/NPL/ +# +# Software distributed under the License is distributed on an "AS +# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express oqr +# implied. See the License for the specific language governing +# rights and limitations under the License. +# +# The Original Code is JavaScript Core Tests. +# +# The Initial Developer of the Original Code is Netscape +# Communications Corporation. Portions created by Netscape are +# Copyright (C) 1997-1999 Netscape Communications Corporation. All +# Rights Reserved. +# +# Alternatively, the contents of this file may be used under the +# terms of the GNU Public License (the "GPL"), in which case the +# provisions of the GPL are applicable instead of those above. +# If you wish to allow use of your version of this file only +# under the terms of the GPL and not to allow others to use your +# version of this file under the NPL, indicate your decision by +# deleting the provisions above and replace them with the notice +# and other provisions required by the GPL. If you do not delete +# the provisions above, a recipient may use your version of this +# file under either the NPL or the GPL. +# +# Contributers: +# Robert Ginda +# +# Creates the meat of a test suite manager page, requites menuhead.html and menufoot.html +# to create the complete page. The test suite manager lets you choose a subset of tests +# to run under the runtests2.pl script. +# + +local $lxr_url = "http://lxr.mozilla.org/mozilla/source/js/tests/"; +local $suite_path = $ARGV[0] || "./"; +local $uid = 0; # radio button unique ID +local $html = ""; # html output +local $javascript = ""; # script output + +&main; + +print (&scriptTag($javascript) . "\n"); +print ($html); + +sub main { + local $i, @suite_list; + + if (!($suite_path =~ /\/$/)) { + $suite_path = $suite_path . "/"; + } + + @suite_list = sort(&get_subdirs ($suite_path)); + + $javascript .= "suites = new Object();\n"; + + $html .= "

Test Suites:

\n"; + $html .= "
\n"; + $html .= " "; + $html .= " "; + + # suite menu + $html .= "\n"; + foreach $suite (@suite_list) { + local @readme_text = ("No description available."); + if (open (README, $suite_path . $suite . "/README")) { + @readme_text = ; + close (README); + } + $html .= "" . + ""; + $html .= ""; + $html .= ""; + $html .= ""; + } + $html .= "
$suite@readme_text "; + $html .= "
\n"; + $html .= ""; + $html .= "
"; + $html .= "
\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] : ""; + &process_suite ($suite_path, $suite_list[$i], $prev_href, $next_href); + } + + $html .= "
\n"; + +} + +# +# Append detail from a 'suite' directory (eg: ecma, ecma_2, js1_1, etc.), calling +# process_test_dir for subordinate categories. +# +sub process_suite { + local ($suite_path, $suite, $prev_href, $next_href) = @_; + local $i, @test_dir_list; + + # suite js object + $javascript .= "suites[\"$suite\"] = {testDirs: {}};\n"; + + @test_dir_list = sort(&get_subdirs ($test_home . $suite)); + + # suite header + $html .= "
$suite " . + "(" . ($#test_dir_list + 1) . " Sub-Categories)
\n"; + $html .= " \n"; + $html .= " " . + "[ Top of page "; + if ($prev_href) { + $html .= " | Previous Suite "; + } + if ($next_href) { + $html .= " | Next Suite "; + } + $html .= "]\n"; + + $html .= "
\n
\n"; + + foreach $i (0 .. $#test_dir_list) { + 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, + $prev_href, $next_href); + } + + $html .= "
\n"; + +} + +# +# 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"; + + $html .= " \n"; + $html .= "
$test_dir (" . ($#test_list + 1) . + " tests)
\n"; + $html .= " \n"; + $html .= " "; + $html .= "[ Top of $suite Suite "; + if ($prev_href) { + $html .= "| Previous Category "; + } + if ($next_href) { + $html .= " | Next Category "; + } + $html .= "]
\n"; + $html .= "
\n"; + + $html .= "
\n"; + + foreach $test (@test_list) { + &process_test ($test_dir_path . $test_dir, $test); + } + + $html .= "
\n"; +} + + +# +# Append detail from a single JavaScript file. +# +sub process_test { + local ($test_dir_path, $test) = @_; + local $title = ""; + + $uid++; + + open (TESTCASE, $test_dir_path . "/" . $test) || + die ("Error opening " . $test_dir_path . "/" . $test); + + while () { + if (/.*TITLE\s+\=\s+\"(.*)\"/) { + $title = $1; + break; + } + } + close (TESTCASE); + + $javascript .= "suites[\"$suite\"].testDirs[\"$test_dir\"].tests" . + "[\"$test\"] = \"radio$uid\"\n"; + $html .= " " . + "" . + "$test $title
\n"; + +} + +sub scriptTag { + + return (""); + +} + +# +# given a directory, return an array of all subdirectories +# +sub get_subdirs { + local ($dir) = @_; + local @subdirs; + + if (!($dir =~ /\/$/)) { + $dir = $dir . "/"; + } + + opendir (DIR, $dir) || die ("couldn't open directory $dir: $!"); + local @testdir_contents = readdir(DIR); + closedir(DIR); + + foreach (@testdir_contents) { + if ((-d ($dir . $_)) && ($_ ne 'CVS') && ($_ ne '.') && ($_ ne '..')) { + @subdirs[$#subdirs + 1] = $_; + } + } + + return @subdirs; +} + +# +# given a directory, return an array of all the js files that are in it. +# +sub get_js_files { + local ($test_subdir) = @_; + local @js_file_array; + + opendir ( TEST_SUBDIR, $test_subdir) || die ("couldn't open directory " . + "$test_subdir: $!"); + @subdir_files = readdir( TEST_SUBDIR ); + closedir( TEST_SUBDIR ); + + foreach ( @subdir_files ) { + if ( $_ =~ /\.js$/ ) { + $js_file_array[$#js_file_array+1] = $_; + } + } + + return @js_file_array; +} + + diff --git a/mozilla/js/tests/runtests2.pl b/mozilla/js/tests/runtests2.pl new file mode 100755 index 00000000000..8026443eb00 --- /dev/null +++ b/mozilla/js/tests/runtests2.pl @@ -0,0 +1,504 @@ +#!/usr/bin/perl +# +# The contents of this file are subject to the Netscape Public +# License Version 1.1 (the "License"); you may not use this file +# except in compliance with the License. You may obtain a copy of +# the License at http://www.mozilla.org/NPL/ +# +# Software distributed under the License is distributed on an "AS +# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express oqr +# implied. See the License for the specific language governing +# rights and limitations under the License. +# +# The Original Code is JavaScript Core Tests. +# +# The Initial Developer of the Original Code is Netscape +# Communications Corporation. Portions created by Netscape are +# Copyright (C) 1997-1999 Netscape Communications Corporation. All +# Rights Reserved. +# +# Alternatively, the contents of this file may be used under the +# terms of the GNU Public License (the "GPL"), in which case the +# provisions of the GPL are applicable instead of those above. +# If you wish to allow use of your version of this file only +# under the terms of the GPL and not to allow others to use your +# version of this file under the NPL, indicate your decision by +# deleting the provisions above and replace them with the notice +# and other provisions required by the GPL. If you do not delete +# the provisions above, a recipient may use your version of this +# file under either the NPL or the GPL. +# +# Contributers: +# Robert Ginda +# +# Second cut at runtests.pl script originally by +# Christine Begle (christine@netscape.com) +# Branched 11/01/99 +# + +use Getopt::Mixed "nextOption"; + +# command line option defaults +local $opt_classpath = ""; +local $opt_engine_type = "smopt"; +local $opt_output_file = ""; +local $opt_test_list_file = ""; +local $opt_suite_path = "./"; +local $opt_shell_path = ""; +local $opt_trace = 1; +local $opt_verbose = 0; +local $opt_lxr_url = "http://lxr.mozilla.org/mozilla/source/js/tests/"; + +# command line option definition +local $options = "c=s classpath>c d smdebug>d f=s file>f h help>h l=s list>l " . + "o smopt>o p=s testpath>p r rhino>r s=s shellpath>s t trace>t v verbose>v " . + "x=s lxrurl>x"; + +&parse_args; + +local $os_type = &get_os_type; +local @test_list = &get_test_list; + +&dd ("output file is '$opt_output_file'"); + +&execute_tests (@test_list); + +sub execute_tests { + local (@test_list) = @_; + local $engine_command = &get_engine_command . " -f"; + local $test, $shell_command, $line, @output; + local $file_param = ($opt_engine_type eq "rhino") ? " " : " -f "; + local $last_suite, $last_test_dir; + + foreach $test (@test_list) { + local ($suite, $test_dir) = split("/", $test); + + if ($last_suite ne $suite || $last_test_dir ne $test_dir) { + $shell_command = $engine_command; + + if (-f $opt_suite_path . $suite . "/shell.js") { + $shell_command .= $file_param . $opt_suite_path . $suite . + "/shell.js"; + } + if (-f $opt_suite_path . $suite . "/" . $test_dir . "/shell.js") { + $shell_command .= $file_param . $opt_suite_path . $suite . + "/" . $test_dir . "/shell.js"; + } + + $last_suite = $suite; + $last_test_dir = $test_dir; + } + + &dd ("executing: " . $shell_command . $file_param . $opt_suite_path . + $test); + + open (OUTPUT, $shell_command . $file_param . $opt_suite_path . $test . + " 2>&1 |"); + @output = ; + close (OUTPUT); + + foreach $line (@output) { + local + + if (!@output) { + &dd ("Test case produced no output!!"); + } + + &dd (@output); + + &dd ("exit code $?"); + } + +} + +sub parse_args { + local $option, $value; + + &dd ("checking command line options."); + + Getopt::Mixed::init ($options); + + while (($option, $value) = nextOption()) { + if ($option eq "c") { + &dd ("opt: setting classpath to '$value'."); + $opt_classpath = $value; + + } elsif ($option eq "d") { + + &dd ("opt: using smdebug engine"); + $opt_engine_type = "smdebug"; + + } elsif ($option eq "f") { + if (!$value) { + die ("Output file cannot be null.\n"); + } + &dd ("opt: setting output file to '$value'."); + $opt_output_file = $value; + + } elsif ($option eq "h") { + &usage; + + } elsif ($option eq "l") { + &dd ("opt: setting test list to '$value'."); + $opt_test_list_file = $value; + + } elsif ($option eq "o") { + &dd ("opt: using smopt engine"); + $opt_engine_type = "smopt"; + + } elsif ($option eq "p") { + $opt_suite_path = $value; + if (!($opt_suite_path =~ /[\/\\]$/)) { + $opt_suite_path .= "/"; + } + &dd ("opt: setting suite path to '$opt_suite_path'."); + + } elsif ($option eq "r") { + &dd ("opt: using rhino engine"); + $opt_engine_type = "rhino"; + + } elsif ($option eq "s") { + $opt_shell_path = $value; + if (!($opt_shell_path =~ /[\/\\]$/)) { + $opt_shell_path .= "/"; + } + &dd ("opt: setting shell path to '$opt_shell_path'."); + + } elsif ($option eq "t") { + &dd ("opt: tracing output."); + $opt_trace = 1; + + } elsif ($option eq "v") { + &dd ("opt: setting verbose mode."); + $opt_verbose = 1; + + } elsif ($option eq "x") { + &dd ("opt: setting lxr url to '$value'."); + $opt_lxr_url = $value; + + } else { + &usage; + } + } + + Getopt::Mixed::cleanup(); + + if (!$opt_output_file) { + $opt_output_file = "results-" . $opt_engine_type . "-" . + &get_tempfile_id . ".html"; + } + +} + +# +# print the arguments that this script expects +# +sub usage { + print STDERR + ("\nusage: $0 [] \n" . + "(-c|--classpath) Classpath (Rhino only)\n" . + "(-d|--smdebug) Test SpiderMonkey Debug engine\n" . + "(-f|--file) Redirect output to file named \n" . + " (default is " . + "results--.html)\n" . + "(-h|--help) Print this message\n" . + "(-l|--list) List of tests to execute\n" . + "(-o|--smopt) Test SpiderMonkey Optimized engine\n" . + "(-p|--testpath) Root of the test suite (default is ./)\n" . + "(-r|--rhino) Test Rhino engine\n" . + "(-s|--shellpath) Location of JavaScript shell\n" . + "(-t|--trace) Trace execution (for debugging)\n" . + # "(-v|--verbose) Show all test cases (not recommended)\n" . + "(-x|--lxrurl) Complete url to tests subdirectory on lxr\n" . + " (default is\n" . + " http://lxr.mozilla.org/mozilla/source/js/" . + "tests/)\n\n"); + + exit (1); + +} + +# +# get the shell command used to start the (either) engine +# +sub get_engine_command { + + local $retval; + + if ($opt_engine_type eq "rhino") { + &dd ("getting rhino engine command."); + $retval = &get_rhino_engine_command; + } else { + &dd ("getting spidermonkey engine command."); + $retval = &get_sm_engine_command; + } + + &dd ("got '$retval'"); + + return $retval; + +} + +# +# get the shell command used to run rhino +# +sub get_rhino_engine_command { + local $retval = "java "; + + if ($opt_shell_path) { + $opt_classpath = ($opt_classpath) ? + $opt_classpath . ":" . $opt_shell_path : + $opt_shell_path; + } + + if ($opt_classpath) { + $retval .= "-classpath $opt_classpath "; + } + + $retval .= "org.mozilla.javascript.tools.shell.Main"; + + return $retval; + +} + +# +# get the shell command used to run spidermonkey +# +sub get_sm_engine_command { + local $retval; + + if ($os_type eq "WIN") { + # spidermonkey on windows + + if ($opt_shell_path) { + $retval = $opt_shell_path; + if (!($retval =~ /[\/\\]$/)) { + $retval .= "/"; + } + } else { + if ($opt_engine_type eq "smopt") { + $retval = "../src/Release/"; + } else { + $retval = "../src/Debug/"; + } + } + $retval .= "jsshell.exe"; + + } else { + # spidermonkey on un*x + + if ($opt_shell_path) { + $retval = $opt_shell_path; + if (!($retval =~ /[\/\\]$/)) { + $retval .= "/"; + } + } else { + $retval = $opt_suite_path . "../src/"; + opendir (SRC_DIR_FILES, $retval); + local @src_dir_files = readdir(SRC_DIR_FILES); + closedir (SRC_DIR_FILES); + + local $dir, $object_dir; + local $pattern = ($opt_engine_type eq "smdebug") ? + 'DBG.OBJ' : 'OPT.OBJ'; + + foreach $dir (@src_dir_files) { + if ($dir =~ $pattern) { + $object_dir = $dir; + break; + } + } + + if (!$object_dir) { + die ("Could not locate an object directory in $retval " . + "matching the pattern *$pattern. Have you built the " . + "engine?\n"); + } + + $retval .= $object_dir . "/"; + } + + $retval .= "js"; + + } + + if (!(-x $retval)) { + die ("$retval is not a valid executable on this system.\n"); + } + + return $retval; + +} + +sub get_os_type { + + local $uname = `uname -a`; + + if ($uname =~ /WIN/) { + $uname = "WIN"; + } else { + chop $uname; + } + + &dd ("get_os_type returning '$uname'."); + return $uname; + +} + +sub get_test_list { + local @test_list; + + if ($opt_test_list_file) { + &dd ("getting test list from file $opt_test_list_file."); + @test_list = &get_user_test_list($opt_test_list_file); + } else { + &dd ("no list file, groveling in '$opt_suite_path'."); + @test_list = &get_default_test_list($opt_suite_path); + } + + &dd ("$#test_list test(s) found."); + + return @test_list; + +} + +# +# reads $list_file, storing non-comment lines into an array. +# +sub get_user_test_list { + local ($list_file) = @_; + local @retval; + + open (TESTLIST, $list_file) || + die("Error opening test list file '$list_file': $!\n"); + + while () { + chop; + if (!(/\s*\#/)) { + $retval[$#retval + 1] = $_; + } + } + + close (TESTLIST); + + return @retval; + +} + +# +# Grovels through $suite_path, searching for *all* test files. Used when the +# user doesn't supply a test list. +# +sub get_default_test_list { + local ($suite_path) = @_; + local @suite_list = &get_subdirs($suite_path); + local $suite; + local @retval; + + foreach $suite (@suite_list) { + local @test_dir_list = get_subdirs ($suite_path . $suite); + local $test_dir; + + foreach $test_dir (@test_dir_list) { + local @test_list = get_js_files ($suite_path . $suite . "/" . + $test_dir); + local $test; + + foreach $test (@test_list) { + $retval[$#retval + 1] = $suite_path . $suite . "/" . $test_dir . + "/" . $test; + } + } + } + + return @retval; + +} + +# +# generate an output file name based on the date +# +sub get_tempfile_id { + local ($sec, $min, $hour, $mday, $mon, $year, $wday, $yday, $isdst) = + &get_padded_localtime; + + return $year . "-" . $mon . "-" . $mday . "-" . $hour . $min . $sec; + +} + +sub get_padded_localtime { + local ($sec, $min, $hour, $mday, $mon, $year, $wday, $yday, $isdst) = + localtime; + + $mon++; + $mon = &zero_pad($mon); + $year= ($year < 2000) ? "19" . $year : $year; + $mday= &zero_pad($mday); + $sec = &zero_pad($sec); + $min = &zero_pad($min); + $hour = &zero_pad($hour); + + return ($sec, $min, $hour, $mday, $mon, $year, $wday, $yday, $isdst); + +} + +sub zero_pad { + local ($string) = @_; + + $string = ($string < 10) ? "0" . $string : $string; + return $string; +} + +# +# given a directory, return an array of all subdirectories +# +sub get_subdirs { + local ($dir) = @_; + local @subdirs; + + if (!($dir =~ /\/$/)) { + $dir = $dir . "/"; + } + + opendir (DIR, $dir) || die ("couldn't open directory $dir: $!"); + local @testdir_contents = readdir(DIR); + closedir(DIR); + + foreach (@testdir_contents) { + if ((-d ($dir . $_)) && ($_ ne 'CVS') && ($_ ne '.') && ($_ ne '..')) { + @subdirs[$#subdirs + 1] = $_; + } + } + + return @subdirs; +} + +# +# given a directory, return an array of all the js files that are in it. +# +sub get_js_files { + local ($test_subdir) = @_; + local @js_file_array; + + opendir ( TEST_SUBDIR, $test_subdir) || die ("couldn't open directory " . + "$test_subdir: $!"); + @subdir_files = readdir( TEST_SUBDIR ); + closedir( TEST_SUBDIR ); + + foreach ( @subdir_files ) { + if ( $_ =~ /\.js$/ ) { + $js_file_array[$#js_file_array+1] = $_; + } + } + + return @js_file_array; +} + +sub dd { + + if ($opt_trace) { + print ("-*- ", @_ , "\n"); + } + +} +