[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677
kdecker
kdecker at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 08:50:01 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit ff544624a5314434b96db423cf191ff59f5338d0
Author: kdecker <kdecker at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Jul 13 23:21:28 2004 +0000
Reviewed by mjs
- added support for the kjs engine type
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@7018 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/JavaScriptCore/tests/mozilla/jsDriver.pl b/JavaScriptCore/tests/mozilla/jsDriver.pl
index 7dbdc8e..053b1ac 100644
--- a/JavaScriptCore/tests/mozilla/jsDriver.pl
+++ b/JavaScriptCore/tests/mozilla/jsDriver.pl
@@ -67,14 +67,14 @@ my $opt_exit_munge = ($os_type ne "MAC") ? 1 : 0;
# command line option definition
my $options = "b=s bugurl>b c=s classpath>c e=s engine>e f=s file>f " .
- "h help>h i j=s javapath>j k confail>k l=s list>l L=s neglist>L " .
- "o=s opt>o p=s testpath>p s=s shellpath>s t trace>t u=s lxrurl>u " .
- "x noexitmunge>x";
+"h help>h i j=s javapath>j k confail>k l=s list>l L=s neglist>L " .
+"o=s opt>o p=s testpath>p s=s shellpath>s t trace>t u=s lxrurl>u " .
+"x noexitmunge>x";
if ($os_type eq "MAC") {
$opt_suite_path = `directory`;
$opt_suite_path =~ s/[\n\r]//g;
- $opt_suite_path .= ":";
+ $opt_suite_path .= ":";
} else {
$opt_suite_path = "./";
}
@@ -92,11 +92,11 @@ if ($#test_list == -1) {
}
if ($unixish) {
- # on unix, ^C pauses the tests, and gives the user a chance to quit but
- # report on what has been done, to just quit, or to continue (the
- # interrupted test will still be skipped.)
- # windows doesn't handle the int handler they way we want it to,
- # so don't even pretend to let the user continue.
+# on unix, ^C pauses the tests, and gives the user a chance to quit but
+# report on what has been done, to just quit, or to continue (the
+# interrupted test will still be skipped.)
+# windows doesn't handle the int handler they way we want it to,
+# so don't even pretend to let the user continue.
$SIG{INT} = 'int_handler';
}
@@ -106,42 +106,42 @@ if ($unixish) {
sub main {
my $start_time;
-
+
while ($opt_engine_type = pop (@opt_engine_list)) {
dd ("Testing engine '$opt_engine_type'");
-
+
$engine_command = &get_engine_command;
$html = "";
@failed_tests = ();
$failures_reported = 0;
$tests_completed = 0;
$start_time = time;
-
-
+
+
&execute_tests (@test_list);
-
+
my $exec_time = (time - $start_time);
my $exec_hours = int($exec_time / 60 / 60);
$exec_time -= $exec_hours * 60 * 60;
my $exec_mins = int($exec_time / 60);
$exec_time -= $exec_mins * 60;
my $exec_secs = ($exec_time % 60);
-
+
if ($exec_hours > 0) {
$exec_time_string = "$exec_hours hours, $exec_mins minutes, " .
- "$exec_secs seconds";
+ "$exec_secs seconds";
} elsif ($exec_mins > 0) {
$exec_time_string = "$exec_mins minutes, $exec_secs seconds";
} else {
$exec_time_string = "$exec_secs seconds";
}
-
+
if (!$opt_user_output_file) {
$opt_output_file = &get_tempfile_name;
}
-
+
&write_results;
-
+
}
}
@@ -150,117 +150,121 @@ sub execute_tests {
my ($test, $shell_command, $line, @output, $path);
my $file_param = " -f ";
my ($last_suite, $last_test_dir);
-
+
+# Don't run any shell.js files as tests; they are only utility files
+ @test_list = grep (!/shell\.js$/, @test_list);
+
&status ("Executing " . ($#test_list + 1) . " test(s).");
-
+
foreach $test (@test_list) {
my ($suite, $test_dir, $test_file) = split($path_sep, $test);
- # *-n.js is a negative test, expect exit code 3 (runtime error)
+# *-n.js is a negative test, expect exit code 3 (runtime error)
my $expected_exit = ($test =~ /\-n\.js$/) ? 3 : 0;
my ($got_exit, $exit_signal);
my $failure_lines;
my $bug_number;
my $status_lines;
-
- # user selected [Q]uit from ^C handler.
+
+# user selected [Q]uit from ^C handler.
if ($user_exit) {
return;
}
-
- # Append the shell.js files to the shell_command if they're there.
- # (only check for their existance if the suite or test_dir has changed
- # since the last time we looked.)
+
+# Append the shell.js files to the shell_command if they're there.
+# (only check for their existance if the suite or test_dir has changed
+# since the last time we looked.)
if ($last_suite ne $suite || $last_test_dir ne $test_dir) {
$shell_command = &xp_path($engine_command);
-
+
$path = &xp_path($opt_suite_path . $suite . "/shell.js");
if (-f $path) {
$shell_command .= $file_param . $path;
}
-
+
$path = &xp_path($opt_suite_path . $suite . "/" .
$test_dir . "/shell.js");
if (-f $path) {
$shell_command .= $file_param . $path;
}
-
+
$last_suite = $suite;
$last_test_dir = $test_dir;
}
-
+
$path = &xp_path($opt_suite_path . $test);
+# &status ("executing: " . $shell_command . $file_param . $path);
&dd ("executing: " . $shell_command . $file_param . $path);
-
+
open (OUTPUT, $shell_command . $file_param . $path .
$redirect_command . " |");
@output = <OUTPUT>;
close (OUTPUT);
-
+
@output = grep (!/js\>/, @output);
-
+
if ($opt_exit_munge == 1) {
- # signal information in the lower 8 bits, exit code above that
+# signal information in the lower 8 bits, exit code above that
$got_exit = ($? >> 8);
$exit_signal = ($? & 255);
} else {
- # user says not to munge the exit code
+# user says not to munge the exit code
$got_exit = $?;
$exit_signal = 0;
}
-
+
$failure_lines = "";
$bug_number = "";
$status_lines = "";
-
+
foreach $line (@output) {
-
- # watch for testcase to proclaim what exit code it expects to
- # produce (0 by default)
+
+# watch for testcase to proclaim what exit code it expects to
+# produce (0 by default)
if ($line =~ /expect(ed)?\s*exit\s*code\s*\:?\s*(\d+)/i) {
$expected_exit = $2;
&dd ("Test case expects exit code $expected_exit");
}
-
- # watch for failures
+
+# watch for failures
if ($line =~ /failed!/i) {
$failure_lines .= $line;
}
-
- # and watch for bugnumbers
- # XXX This only allows 1 bugnumber per testfile, should be
- # XXX modified to allow for multiple.
+
+# and watch for bugnumbers
+# XXX This only allows 1 bugnumber per testfile, should be
+# XXX modified to allow for multiple.
if ($line =~ /bugnumber\s*\:?\s*(.*)/i) {
$1 =~ /(\n+)/;
$bug_number = $1;
}
-
- # and watch for status
+
+# and watch for status
if ($line =~ /status/i) {
$status_lines .= $line;
}
-
+
}
-
+
if (!@output) {
@output = ("Testcase produced no output!");
}
-
+
if ($got_exit != $expected_exit) {
- # full testcase output dumped on mismatched exit codes,
+# full testcase output dumped on mismatched exit codes,
&report_failure ($test, "Expected exit code " .
"$expected_exit, got $got_exit\n" .
"Testcase terminated with signal $exit_signal\n" .
"Complete testcase output was:\n" .
join ("\n", at output), $bug_number);
} elsif ($failure_lines) {
- # only offending lines if exit codes matched
+# only offending lines if exit codes matched
&report_failure ($test, "$status_lines\n".
"Failure messages were:\n$failure_lines",
$bug_number);
}
-
+
&dd ("exit code $got_exit, exit signal $exit_signal.");
-
+
$tests_completed++;
}
}
@@ -269,9 +273,9 @@ sub write_results {
my ($list_name, $neglist_name);
my $completion_date = localtime;
my $failure_pct = int(($failures_reported / $tests_completed) * 10000) /
- 100;
+ 100;
&dd ("Writing output to $opt_output_file.");
-
+
if ($#opt_test_list_files == -1) {
$list_name = "All tests";
} elsif ($#opt_test_list_files < 10) {
@@ -279,7 +283,7 @@ sub write_results {
} else {
$list_name = "($#opt_test_list_files test files specified)";
}
-
+
if ($#opt_neg_list_files == -1) {
$neglist_name = "(none)";
} elsif ($#opt_test_list_files < 10) {
@@ -287,26 +291,26 @@ sub write_results {
} else {
$neglist_name = "($#opt_neg_list_files skip files specified)";
}
-
+
open (OUTPUT, "> $opt_output_file") ||
- die ("Could not create output file $opt_output_file");
-
+ die ("Could not create output file $opt_output_file");
+
print OUTPUT
- ("<html><head>\n" .
- "<title>Test results, $opt_engine_type</title>\n" .
- "</head>\n" .
- "<body bgcolor='white'>\n" .
- "<a name='tippy_top'></a>\n" .
- "<h2>Test results, $opt_engine_type</h2><br>\n" .
- "<p class='results_summary'>\n" .
- "Test List: $list_name<br>\n" .
- "Skip List: $neglist_name<br>\n" .
- ($#test_list + 1) . " test(s) selected, $tests_completed test(s) " .
- "completed, $failures_reported failures reported " .
- "($failure_pct% failed)<br>\n" .
- "Engine command line: $engine_command<br>\n" .
- "OS type: $os_type<br>\n");
-
+ ("<html><head>\n" .
+ "<title>Test results, $opt_engine_type</title>\n" .
+ "</head>\n" .
+ "<body bgcolor='white'>\n" .
+ "<a name='tippy_top'></a>\n" .
+ "<h2>Test results, $opt_engine_type</h2><br>\n" .
+ "<p class='results_summary'>\n" .
+ "Test List: $list_name<br>\n" .
+ "Skip List: $neglist_name<br>\n" .
+ ($#test_list + 1) . " test(s) selected, $tests_completed test(s) " .
+ "completed, $failures_reported failures reported " .
+ "($failure_pct% failed)<br>\n" .
+ "Engine command line: $engine_command<br>\n" .
+ "OS type: $os_type<br>\n");
+
if ($opt_engine_type =~ /^rhino/) {
open (JAVAOUTPUT, $opt_java_path . "java -fullversion " .
$redirect_command . " |");
@@ -314,75 +318,74 @@ sub write_results {
print OUTPUT "<BR>";
close (JAVAOUTPUT);
}
-
+
print OUTPUT
- ("Testcase execution time: $exec_time_string.<br>\n" .
- "Tests completed on $completion_date.<br><br>\n");
-
+ ("Testcase execution time: $exec_time_string.<br>\n" .
+ "Tests completed on $completion_date.<br><br>\n");
+
if ($failures_reported > 0) {
print OUTPUT
- ("[ <a href='#fail_detail'>Failure Details</a> | " .
- "<a href='#retest_list'>Retest List</a> | " .
- "<a href='menu.html'>Test Selection Page</a> ]<br>\n" .
- "<hr>\n" .
- "<a name='fail_detail'></a>\n" .
- "<h2>Failure Details</h2><br>\n<dl>" .
- $html .
- "</dl>\n[ <a href='#tippy_top'>Top of Page</a> | " .
- "<a href='#fail_detail'>Top of Failures</a> ]<br>\n" .
- "<hr>\n" .
- "<a name='retest_list'></a>\n" .
- "<h2>Retest List</h2><br>\n" .
- "<pre>\n" .
- "# Retest List, $opt_engine_type, " .
- "generated $completion_date.\n" .
- "# Original test base was: $list_name.\n" .
- "# $tests_completed of " . ($#test_list + 1) .
- " test(s) were completed, " .
- "$failures_reported failures reported.\n" .
- join ("\n", @failed_tests) .
- "</pre>\n" .
- "[ <a href='#tippy_top'>Top of Page</a> | " .
- "<a href='#retest_list'>Top of Retest List</a> ]<br>\n");
+ ("[ <a href='#fail_detail'>Failure Details</a> | " .
+ "<a href='#retest_list'>Retest List</a> | " .
+ "<a href='menu.html'>Test Selection Page</a> ]<br>\n" .
+ "<hr>\n" .
+ "<a name='fail_detail'></a>\n" .
+ "<h2>Failure Details</h2><br>\n<dl>" .
+ $html .
+ "</dl>\n[ <a href='#tippy_top'>Top of Page</a> | " .
+ "<a href='#fail_detail'>Top of Failures</a> ]<br>\n" .
+ "<hr>\n<pre>\n" .
+ "<a name='retest_list'></a>\n" .
+ "<h2>Retest List</h2><br>\n" .
+ "# Retest List, $opt_engine_type, " .
+ "generated $completion_date.\n" .
+ "# Original test base was: $list_name.\n" .
+ "# $tests_completed of " . ($#test_list + 1) .
+ " test(s) were completed, " .
+ "$failures_reported failures reported.\n" .
+ join ("\n", @failed_tests) );
+#"</pre>\n" .
+# "[ <a href='#tippy_top'>Top of Page</a> | " .
+# "<a href='#retest_list'>Top of Retest List</a> ]<br>\n");
} else {
print OUTPUT
- ("<h1>Whoop-de-doo, nothing failed!</h1>\n");
+ ("<h1>Whoop-de-doo, nothing failed!</h1>\n");
}
- print OUTPUT "</body>";
+#print OUTPUT "</body>";
- close (OUTPUT);
+close (OUTPUT);
- &status ("Wrote results to '$opt_output_file'.");
+&status ("Wrote results to '$opt_output_file'.");
- if ($opt_console_failures) {
- &status ("$failures_reported test(s) failed");
- }
+if ($opt_console_failures) {
+ &status ("$failures_reported test(s) failed");
+}
}
sub parse_args {
my ($option, $value, $lastopt);
-
+
&dd ("checking command line options.");
-
+
Getopt::Mixed::init ($options);
$Getopt::Mixed::order = $Getopt::Mixed::RETURN_IN_ORDER;
-
+
while (($option, $value) = nextOption()) {
-
+
if ($option eq "b") {
&dd ("opt: setting bugurl to '$value'.");
$opt_bug_url = $value;
-
+
} elsif ($option eq "c") {
&dd ("opt: setting classpath to '$value'.");
$opt_classpath = $value;
-
+
} elsif (($option eq "e") || (($option eq "") && ($lastopt eq "e"))) {
&dd ("opt: adding engine $value.");
push (@opt_engine_list, $value);
-
+
} elsif ($option eq "f") {
if (!$value) {
die ("Output file cannot be null.\n");
@@ -390,38 +393,38 @@ sub parse_args {
&dd ("opt: setting output file to '$value'.");
$opt_user_output_file = 1;
$opt_output_file = $value;
-
+
} elsif ($option eq "h") {
&usage;
-
+
} elsif ($option eq "j") {
if (!($value =~ /[\/\\]$/)) {
$value .= "/";
}
&dd ("opt: setting java path to '$value'.");
$opt_java_path = $value;
-
+
} elsif ($option eq "k") {
&dd ("opt: displaying failures on console.");
$opt_console_failures=1;
-
+
} elsif ($option eq "l" || (($option eq "") && ($lastopt eq "l"))) {
$option = "l";
&dd ("opt: adding test list '$value'.");
push (@opt_test_list_files, $value);
-
+
} elsif ($option eq "L" || (($option eq "") && ($lastopt eq "L"))) {
$option = "L";
&dd ("opt: adding negative list '$value'.");
push (@opt_neg_list_files, $value);
-
+
} elsif ($option eq "o") {
$opt_engine_params = $value;
&dd ("opt: setting engine params to '$opt_engine_params'.");
-
+
} elsif ($option eq "p") {
$opt_suite_path = $value;
-
+
if ($os_type eq "MAC") {
if (!($opt_suite_path =~ /\:$/)) {
$opt_suite_path .= ":";
@@ -431,40 +434,40 @@ sub parse_args {
$opt_suite_path .= "/";
}
}
-
+
&dd ("opt: setting suite path to '$opt_suite_path'.");
-
+
} elsif ($option eq "s") {
$opt_shell_path = $value;
&dd ("opt: setting shell path to '$opt_shell_path'.");
-
+
} elsif ($option eq "t") {
&dd ("opt: tracing output. (console failures at no extra charge.)");
$opt_console_failures = 1;
$opt_trace = 1;
-
+
} elsif ($option eq "u") {
&dd ("opt: setting lxr url to '$value'.");
$opt_lxr_url = $value;
-
+
} elsif ($option eq "x") {
&dd ("opt: turning off exit munging.");
$opt_exit_munge = 0;
-
+
} else {
&usage;
}
-
+
$lastopt = $option;
-
+
}
-
+
Getopt::Mixed::cleanup();
-
+
if ($#opt_engine_list == -1) {
die "You must select a shell to test in.\n";
}
-
+
}
#
@@ -472,43 +475,43 @@ sub parse_args {
#
sub usage {
print STDERR
- ("\nusage: $0 [<options>] \n" .
- "(-b|--bugurl) Bugzilla URL.\n" .
- " (default is $opt_bug_url)\n" .
- "(-c|--classpath) Classpath (Rhino only.)\n" .
- "(-e|--engine) <type> ... Specify the type of engine(s) to test.\n" .
- " <type> is one or more of\n" .
- " (smopt|smdebug|lcopt|lcdebug|xpcshell|" .
- "rhino|rhinoi|rhinoms|rhinomsi|rhino9|rhinoms9).\n" .
- "(-f|--file) <file> Redirect output to file named <file>.\n" .
- " (default is " .
- "results-<engine-type>-<date-stamp>.html)\n" .
- "(-h|--help) Print this message.\n" .
- "(-j|--javapath) Location of java executable.\n" .
- "(-k|--confail) Log failures to console (also.)\n" .
- "(-l|--list) <file> ... List of tests to execute.\n" .
- "(-L|--neglist) <file> ... List of tests to skip.\n" .
- "(-o|--opt) <options> Options to pass to the JavaScript engine.\n" .
- " (Make sure to quote them!)\n" .
- "(-p|--testpath) <path> Root of the test suite. (default is ./)\n" .
- "(-s|--shellpath) <path> Location of JavaScript shell.\n" .
- "(-t|--trace) Trace script execution.\n" .
- "(-u|--lxrurl) <url> Complete URL to tests subdirectory on lxr.\n" .
- " (default is $opt_lxr_url)\n" .
- "(-x|--noexitmunge) Don't do exit code munging (try this if it\n" .
- " seems like your exit codes are turning up\n" .
- " as exit signals.)\n");
+ ("\nusage: $0 [<options>] \n" .
+ "(-b|--bugurl) Bugzilla URL.\n" .
+ " (default is $opt_bug_url)\n" .
+ "(-c|--classpath) Classpath (Rhino only.)\n" .
+ "(-e|--engine) <type> ... Specify the type of engine(s) to test.\n" .
+ " <type> is one or more of\n" .
+ " (kjs|smopt|smdebug|lcopt|lcdebug|xpcshell|" .
+ "rhino|rhinoi|rhinoms|rhinomsi|rhino9|rhinoms9).\n" .
+ "(-f|--file) <file> Redirect output to file named <file>.\n" .
+ " (default is " .
+ "results-<engine-type>-<date-stamp>.html)\n" .
+ "(-h|--help) Print this message.\n" .
+ "(-j|--javapath) Location of java executable.\n" .
+ "(-k|--confail) Log failures to console (also.)\n" .
+ "(-l|--list) <file> ... List of tests to execute.\n" .
+ "(-L|--neglist) <file> ... List of tests to skip.\n" .
+ "(-o|--opt) <options> Options to pass to the JavaScript engine.\n" .
+ " (Make sure to quote them!)\n" .
+ "(-p|--testpath) <path> Root of the test suite. (default is ./)\n" .
+ "(-s|--shellpath) <path> Location of JavaScript shell.\n" .
+ "(-t|--trace) Trace script execution.\n" .
+ "(-u|--lxrurl) <url> Complete URL to tests subdirectory on lxr.\n" .
+ " (default is $opt_lxr_url)\n" .
+ "(-x|--noexitmunge) Don't do exit code munging (try this if it\n" .
+ " seems like your exit codes are turning up\n" .
+ " as exit signals.)\n");
exit (1);
-
+
}
#
# get the shell command used to start the (either) engine
#
sub get_engine_command {
-
+
my $retval;
-
+
if ($opt_engine_type eq "rhino") {
&dd ("getting rhino engine command.");
$opt_rhino_opt = 0;
@@ -551,16 +554,20 @@ sub get_engine_command {
} elsif ($opt_engine_type =~ /^ep(opt|debug)$/) {
&dd ("getting epimetheus engine command.");
$retval = &get_ep_engine_command;
+ } elsif ($opt_engine_type ="kjs") {
+ &dd ("getting kjs engine command.");
+ $retval = &get_kjs_engine_command;
+
} else {
die ("Unknown engine type selected, '$opt_engine_type'.\n");
}
-
+
$retval .= " $opt_engine_params";
-
+
&dd ("got '$retval'");
-
+
return $retval;
-
+
}
#
@@ -568,25 +575,25 @@ sub get_engine_command {
#
sub get_rhino_engine_command {
my $retval = $opt_java_path . ($opt_rhino_ms ? "jview " : "java ");
-
+
if ($opt_shell_path) {
$opt_classpath = ($opt_classpath) ?
- $opt_classpath . ":" . $opt_shell_path :
- $opt_shell_path;
+ $opt_classpath . ":" . $opt_shell_path :
+ $opt_shell_path;
}
-
+
if ($opt_classpath) {
$retval .= ($opt_rhino_ms ? "/cp:p" : "-classpath") . " $opt_classpath ";
}
-
+
$retval .= "org.mozilla.javascript.tools.shell.Main";
-
+
if ($opt_rhino_opt) {
$retval .= " -opt $opt_rhino_opt";
}
-
+
return $retval;
-
+
}
#
@@ -595,35 +602,42 @@ sub get_rhino_engine_command {
sub get_xpc_engine_command {
my $retval;
my $m5_home = @ENV{"MOZILLA_FIVE_HOME"} ||
- die ("You must set MOZILLA_FIVE_HOME to use the xpcshell" ,
- (!$unixish) ? "." : ", also " .
- "setting LD_LIBRARY_PATH to the same directory may get rid of " .
- "any 'library not found' errors.\n");
-
+ die ("You must set MOZILLA_FIVE_HOME to use the xpcshell" ,
+ (!$unixish) ? "." : ", also " .
+ "setting LD_LIBRARY_PATH to the same directory may get rid of " .
+ "any 'library not found' errors.\n");
+
if (($unixish) && (!@ENV{"LD_LIBRARY_PATH"})) {
print STDERR "-#- WARNING: LD_LIBRARY_PATH is not set, xpcshell may " .
- "not be able to find the required components.\n";
+ "not be able to find the required components.\n";
}
-
+
if (!($m5_home =~ /[\/\\]$/)) {
$m5_home .= "/";
}
-
+
$retval = $m5_home . "xpcshell";
-
+
if ($os_type eq "WIN") {
$retval .= ".exe";
}
-
+
$retval = &xp_path($retval);
-
+
if (($os_type ne "MAC") && !(-x $retval)) {
- # mac doesn't seem to deal with -x correctly
+# mac doesn't seem to deal with -x correctly
die ($retval . " is not a valid executable on this system.\n");
}
-
+
return $retval;
+
+}
+#
+# get the shell command used to run kjs
+#
+sub get_kjs_engine_command {
+ return $ENV{"SYMROOTS"} . "/testkjs";
}
#
@@ -631,17 +645,17 @@ sub get_xpc_engine_command {
#
sub get_sm_engine_command {
my $retval;
-
- # Look for Makefile.ref style make first.
- # (On Windows, spidermonkey can be made by two makefiles, each putting the
- # executable in a diferent directory, under a different name.)
-
+
+# Look for Makefile.ref style make first.
+# (On Windows, spidermonkey can be made by two makefiles, each putting the
+# executable in a diferent directory, under a different name.)
+
if ($opt_shell_path) {
- # if the user provided a path to the shell, return that.
+# if the user provided a path to the shell, return that.
$retval = $opt_shell_path;
-
+
} else {
-
+
if ($os_type eq "MAC") {
$retval = $opt_suite_path . ":src:macbuild:JS";
} else {
@@ -649,31 +663,31 @@ sub get_sm_engine_command {
opendir (SRC_DIR_FILES, $retval);
my @src_dir_files = readdir(SRC_DIR_FILES);
closedir (SRC_DIR_FILES);
-
+
my ($dir, $object_dir);
my $pattern = ($opt_engine_type eq "smdebug") ?
- 'DBG.OBJ' : 'OPT.OBJ';
-
- # scan for the first directory matching
- # the pattern expected to hold this type (debug or opt) of engine
+ 'DBG.OBJ' : 'OPT.OBJ';
+
+# scan for the first directory matching
+# the pattern expected to hold this type (debug or opt) of engine
foreach $dir (@src_dir_files) {
if ($dir =~ $pattern) {
$object_dir = $dir;
last;
}
}
-
+
if (!$object_dir && $os_type ne "WIN") {
die ("Could not locate an object directory in $retval " .
"matching the pattern *$pattern. Have you built the " .
"engine?\n");
}
-
+
if (!(-x $retval . $object_dir . "/js.exe") && ($os_type eq "WIN")) {
- # On windows, you can build with js.mak as well as Makefile.ref
- # (Can you say WTF boys and girls? I knew you could.)
- # So, if the exe the would have been built by Makefile.ref isn't
- # here, check for the js.mak version before dying.
+# On windows, you can build with js.mak as well as Makefile.ref
+# (Can you say WTF boys and girls? I knew you could.)
+# So, if the exe the would have been built by Makefile.ref isn't
+# here, check for the js.mak version before dying.
if ($opt_shell_path) {
$retval = $opt_shell_path;
if (!($retval =~ /[\/\\]$/)) {
@@ -686,9 +700,9 @@ sub get_sm_engine_command {
$retval = "../src/Debug/";
}
}
-
+
$retval .= "jsshell.exe";
-
+
} else {
$retval .= $object_dir . "/js";
if ($os_type eq "WIN") {
@@ -696,19 +710,19 @@ sub get_sm_engine_command {
}
}
} # mac/ not mac
-
+
$retval = &xp_path($retval);
-
+
} # (user provided a path)
-
-
- if (($os_type ne "MAC") && !(-x $retval)) {
- # mac doesn't seem to deal with -x correctly
- die ($retval . " is not a valid executable on this system.\n");
- }
-
+
+
+ if (($os_type ne "MAC") && !(-x $retval)) {
+# mac doesn't seem to deal with -x correctly
+ die ($retval . " is not a valid executable on this system.\n");
+ }
+
return $retval;
-
+
}
#
@@ -716,24 +730,24 @@ sub get_sm_engine_command {
#
sub get_ep_engine_command {
my $retval;
-
+
if ($opt_shell_path) {
- # if the user provided a path to the shell, return that -
+# if the user provided a path to the shell, return that -
$retval = $opt_shell_path;
-
+
} else {
my $dir;
my $os;
my $debug;
my $opt;
my $exe;
-
+
$dir = $opt_suite_path . "../../js2/src/";
-
+
if ($os_type eq "MAC") {
- #
- # On the Mac, the debug and opt builds lie in the same directory -
- #
+#
+# On the Mac, the debug and opt builds lie in the same directory -
+#
$os = "macbuild:";
$debug = "";
$opt = "";
@@ -747,26 +761,26 @@ sub get_ep_engine_command {
$os = "";
$debug = "";
$opt = ""; # <<<----- XXX THIS IS NOT RIGHT! CHANGE IT!
- $exe = "epimetheus";
+ $exe = "epimetheus";
}
-
-
+
+
if ($opt_engine_type eq "epdebug") {
$retval = $dir . $os . $debug . $exe;
} else {
$retval = $dir . $os . $opt . $exe;
}
-
+
$retval = &xp_path($retval);
-
+
}# (user provided a path)
-
-
- if (($os_type ne "MAC") && !(-x $retval)) {
- # mac doesn't seem to deal with -x correctly
- die ($retval . " is not a valid executable on this system.\n");
- }
-
+
+
+ if (($os_type ne "MAC") && !(-x $retval)) {
+# mac doesn't seem to deal with -x correctly
+ die ($retval . " is not a valid executable on this system.\n");
+ }
+
return $retval;
}
@@ -775,7 +789,7 @@ sub get_ep_engine_command {
#
sub get_lc_engine_command {
my $retval;
-
+
if ($opt_shell_path) {
$retval = $opt_shell_path;
} else {
@@ -786,112 +800,109 @@ sub get_lc_engine_command {
opendir (SRC_DIR_FILES, $retval);
my @src_dir_files = readdir(SRC_DIR_FILES);
closedir (SRC_DIR_FILES);
-
+
my ($dir, $object_dir);
my $pattern = ($opt_engine_type eq "lcdebug") ?
- 'DBG.OBJ' : 'OPT.OBJ';
-
+ 'DBG.OBJ' : 'OPT.OBJ';
+
foreach $dir (@src_dir_files) {
if ($dir =~ $pattern) {
$object_dir = $dir;
last;
}
}
-
+
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 . "/";
-
+
if ($os_type eq "WIN") {
$retval .= "lcshell.exe";
} else {
$retval .= "lcshell";
}
} # mac/ not mac
-
+
$retval = &xp_path($retval);
-
+
} # (user provided a path)
-
-
- if (($os_type ne "MAC") && !(-x $retval)) {
- # mac doesn't seem to deal with -x correctly
- die ("$retval is not a valid executable on this system.\n");
- }
-
+
+
+ if (($os_type ne "MAC") && !(-x $retval)) {
+# mac doesn't seem to deal with -x correctly
+ die ("$retval is not a valid executable on this system.\n");
+ }
+
return $retval;
-
+
}
sub get_os_type {
-
+
if ("\n" eq "\015") {
return "MAC";
}
-
+
my $uname = `uname -a`;
-
+
if ($uname =~ /WIN/) {
$uname = "WIN";
} else {
chop $uname;
}
-
+
&dd ("get_os_type returning '$uname'.");
return $uname;
-
+
}
sub get_test_list {
my @test_list;
my @neg_list;
-
+
if ($#opt_test_list_files > -1) {
my $list_file;
-
+
&dd ("getting test list from user specified source.");
-
+
foreach $list_file (@opt_test_list_files) {
push (@test_list, &expand_user_test_list($list_file));
}
} else {
&dd ("no list file, groveling in '$opt_suite_path'.");
-
+
@test_list = &get_default_test_list($opt_suite_path);
}
-
+
if ($#opt_neg_list_files > -1) {
my $list_file;
my $orig_size = $#test_list + 1;
my $actually_skipped;
-
+
&dd ("getting negative list from user specified source.");
-
+
foreach $list_file (@opt_neg_list_files) {
push (@neg_list, &expand_user_test_list($list_file));
}
-
+
@test_list = &subtract_arrays (\@test_list, \@neg_list);
-
+
$actually_skipped = $orig_size - ($#test_list + 1);
-
+
&dd ($actually_skipped . " of " . $orig_size .
" tests will be skipped.");
&dd ((($#neg_list + 1) - $actually_skipped) . " skip tests were " .
"not actually part of the test list.");
-
+
+
}
-
-
- # Don't run any shell.js files as tests; they are only utility files
- @test_list = grep (!/shell\.js$/, @test_list);
-
+
return @test_list;
-
+
}
#
@@ -902,43 +913,43 @@ sub get_test_list {
sub expand_user_test_list {
my ($list_file) = @_;
my @retval = ();
-
- #
- # Trim off the leading path separator that begins relative paths on the Mac.
- # Each path will get concatenated with $opt_suite_path, which ends in one.
- #
- # Also note:
- #
- # We will call expand_test_list_entry(), which does pattern-matching on $list_file.
- # This will make the pattern-matching the same as it would be on Linux/Windows -
- #
+
+#
+# Trim off the leading path separator that begins relative paths on the Mac.
+# Each path will get concatenated with $opt_suite_path, which ends in one.
+#
+# Also note:
+#
+# We will call expand_test_list_entry(), which does pattern-matching on $list_file.
+# This will make the pattern-matching the same as it would be on Linux/Windows -
+#
if ($os_type eq "MAC") {
$list_file =~ s/^$path_sep//;
}
-
+
if ($list_file =~ /\.js$/ || -d $opt_suite_path . $list_file) {
-
+
push (@retval, &expand_test_list_entry($list_file));
-
+
} else {
-
+
open (TESTLIST, $list_file) ||
- die("Error opening test list file '$list_file': $!\n");
-
+ die("Error opening test list file '$list_file': $!\n");
+
while (<TESTLIST>) {
s/\r*\n*$//;
if (!(/\s*\#/)) {
- # It's not a comment, so process it
+# It's not a comment, so process it
push (@retval, &expand_test_list_entry($_));
}
}
-
+
close (TESTLIST);
-
+
}
-
+
return @retval;
-
+
}
@@ -949,55 +960,55 @@ sub expand_user_test_list {
sub expand_test_list_entry {
my ($entry) = @_;
my @retval;
-
+
if ($entry =~ /\.js$/) {
- # it's a regular entry, add it to the list
+# it's a regular entry, add it to the list
if (-f $opt_suite_path . $entry) {
push (@retval, $entry);
} else {
status ("testcase '$entry' not found.");
}
} elsif ($entry =~ /(.*$path_sep[^\*][^$path_sep]*)$path_sep?\*?$/) {
- # Entry is in the form suite_dir/test_dir[/*]
- # so iterate all tests under it
- my $suite_and_test_dir = $1;
- my @test_files = &get_js_files ($opt_suite_path .
- $suite_and_test_dir);
- my $i;
-
- foreach $i (0 .. $#test_files) {
- $test_files[$i] = $suite_and_test_dir . $path_sep .
- $test_files[$i];
- }
-
- splice (@retval, $#retval + 1, 0, @test_files);
-
+# Entry is in the form suite_dir/test_dir[/*]
+# so iterate all tests under it
+ my $suite_and_test_dir = $1;
+ my @test_files = &get_js_files ($opt_suite_path .
+ $suite_and_test_dir);
+ my $i;
+
+ foreach $i (0 .. $#test_files) {
+ $test_files[$i] = $suite_and_test_dir . $path_sep .
+ $test_files[$i];
+ }
+
+ splice (@retval, $#retval + 1, 0, @test_files);
+
} elsif ($entry =~ /([^\*][^$path_sep]*)$path_sep?\*?$/) {
- # Entry is in the form suite_dir[/*]
- # so iterate all test dirs and tests under it
- my $suite = $1;
- my @test_dirs = &get_subdirs ($opt_suite_path . $suite);
- my $test_dir;
-
- foreach $test_dir (@test_dirs) {
- my @test_files = &get_js_files ($opt_suite_path . $suite .
- $path_sep . $test_dir);
- my $i;
-
- foreach $i (0 .. $#test_files) {
- $test_files[$i] = $suite . $path_sep . $test_dir . $path_sep .
- $test_files[$i];
- }
-
- splice (@retval, $#retval + 1, 0, @test_files);
- }
-
+# Entry is in the form suite_dir[/*]
+# so iterate all test dirs and tests under it
+ my $suite = $1;
+ my @test_dirs = &get_subdirs ($opt_suite_path . $suite);
+ my $test_dir;
+
+ foreach $test_dir (@test_dirs) {
+ my @test_files = &get_js_files ($opt_suite_path . $suite .
+ $path_sep . $test_dir);
+ my $i;
+
+ foreach $i (0 .. $#test_files) {
+ $test_files[$i] = $suite . $path_sep . $test_dir . $path_sep .
+ $test_files[$i];
+ }
+
+ splice (@retval, $#retval + 1, 0, @test_files);
+ }
+
} else {
die ("Dont know what to do with list entry '$entry'.\n");
}
-
- return @retval;
-
+
+ return @retval;
+
}
#
@@ -1009,25 +1020,25 @@ sub get_default_test_list {
my @suite_list = &get_subdirs($suite_path);
my $suite;
my @retval;
-
+
foreach $suite (@suite_list) {
my @test_dir_list = get_subdirs ($suite_path . $suite);
my $test_dir;
-
+
foreach $test_dir (@test_dir_list) {
my @test_list = get_js_files ($suite_path . $suite . $path_sep .
$test_dir);
my $test;
-
+
foreach $test (@test_list) {
$retval[$#retval + 1] = $suite . $path_sep . $test_dir .
- $path_sep . $test;
+ $path_sep . $test;
}
}
}
-
+
return @retval;
-
+
}
#
@@ -1035,23 +1046,23 @@ sub get_default_test_list {
#
sub get_tempfile_name {
my ($sec, $min, $hour, $mday, $mon, $year, $wday, $yday, $isdst) =
- &get_padded_time (localtime);
+ &get_padded_time (localtime);
my $rv;
-
+
if ($os_type ne "MAC") {
$rv = "results-" . $year . "-" . $mon . "-" . $mday . "-" . $hour .
- $min . $sec . "-" . $opt_engine_type;
+ $min . $sec . "-" . $opt_engine_type;
} else {
$rv = "res-" . $year . $mon . $mday . $hour . $min . $sec . "-" .
- $opt_engine_type
+ $opt_engine_type
}
-
+
return $rv . ".html";
}
sub get_padded_time {
my ($sec, $min, $hour, $mday, $mon, $year, $wday, $yday, $isdst) = @_;
-
+
$mon++;
$mon = &zero_pad($mon);
$year += 1900;
@@ -1059,14 +1070,14 @@ sub get_padded_time {
$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 {
my ($string) = @_;
-
+
$string = ($string < 10) ? "0" . $string : $string;
return $string;
}
@@ -1076,13 +1087,13 @@ sub subtract_arrays {
my @whole = @$whole_ref;
my @part = @$part_ref;
my $line;
-
+
foreach $line (@part) {
@whole = grep (!/$line/, @whole);
}
-
+
return @whole;
-
+
}
#
@@ -1093,7 +1104,7 @@ sub unix_to_mac {
my @path_elements = split ("/", $path);
my $rv = "";
my $i;
-
+
foreach $i (0 .. $#path_elements) {
if ($path_elements[$i] eq ".") {
if (!($rv =~ /\:$/)) {
@@ -1108,25 +1119,25 @@ sub unix_to_mac {
} elsif ($path_elements[$i] ne "") {
$rv .= $path_elements[$i] . ":";
}
-
+
}
-
+
$rv =~ s/\:$//;
-
- return $rv;
+
+ return $rv;
}
#
# Convert unix path to win style.
#
sub unix_to_win {
- my ($path) = @_;
-
- if ($path_sep ne $win_sep) {
- $path =~ s/$path_sep/$win_sep/g;
- }
-
- return $path;
+ my ($path) = @_;
+
+ if ($path_sep ne $win_sep) {
+ $path =~ s/$path_sep/$win_sep/g;
+ }
+
+ return $path;
}
#
@@ -1134,9 +1145,9 @@ sub unix_to_win {
# Find out the one used in the current Windows shell.
#
sub get_win_sep {
- my $path = $ENV{"PATH"} || $ENV{"Path"} || $ENV{"path"};
- $path =~ /\\|\//;
- return $&;
+ my $path = $ENV{"PATH"} || $ENV{"Path"} || $ENV{"path"};
+ $path =~ /\\|\//;
+ return $&;
}
#
@@ -1144,7 +1155,7 @@ sub get_win_sep {
#
sub xp_path {
my ($path) = @_;
-
+
if ($os_type eq "MAC") {
return &unix_to_mac($path);
} elsif($os_type eq "WIN") {
@@ -1160,7 +1171,7 @@ sub xp_path {
sub get_subdirs {
my ($dir) = @_;
my @subdirs;
-
+
if ($os_type ne "MAC") {
if (!($dir =~ /\/$/)) {
$dir = $dir . "/";
@@ -1173,13 +1184,13 @@ sub get_subdirs {
opendir (DIR, $dir) || die ("couldn't open directory $dir: $!");
my @testdir_contents = readdir(DIR);
closedir(DIR);
-
+
foreach (@testdir_contents) {
if ((-d ($dir . $_)) && ($_ ne 'CVS') && ($_ ne '.') && ($_ ne '..')) {
@subdirs[$#subdirs + 1] = $_;
}
}
-
+
return @subdirs;
}
@@ -1189,100 +1200,100 @@ sub get_subdirs {
sub get_js_files {
my ($test_subdir) = @_;
my (@js_file_array, @subdir_files);
-
+
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 report_failure {
my ($test, $message, $bug_number) = @_;
my $bug_line = "";
-
+
$failures_reported++;
-
+
$message =~ s/\n+/\n/g;
$test =~ s/\:/\//g;
-
- if ($opt_console_failures) {
- if($bug_number) {
- print STDERR ("*-* Testcase $test failed:\nBug Number $bug_number".
- "\n$message\n");
- } else {
- print STDERR ("*-* Testcase $test failed:\n$message\n");
+
+ if ($opt_console_failures) {
+ if($bug_number) {
+ print STDERR ("*-* Testcase $test failed:\nBug Number $bug_number".
+ "\n$message\n");
+ } else {
+ print STDERR ("*-* Testcase $test failed:\n$message\n");
+ }
}
- }
-
+
$message =~ s/\n/<br>\n/g;
$html .= "<a name='failure$failures_reported'></a>";
-
+
if ($bug_number) {
$bug_line = "<a href='$opt_bug_url$bug_number' target='other_window'>".
- "Bug Number $bug_number</a>";
+ "Bug Number $bug_number</a>";
}
-
+
if ($opt_lxr_url) {
$test =~ /\/?([^\/]+\/[^\/]+\/[^\/]+)$/;
$test = $1;
$html .= "<dd><b>".
- "Testcase <a target='other_window' href='$opt_lxr_url$test'>$1</a> " .
+ "Testcase <a target='other_window' href='$opt_lxr_url$test'>$1</a> " .
"failed</b> $bug_line<br>\n";
} else {
$html .= "<dd><b>".
- "Testcase $test failed</b> $bug_line<br>\n";
+ "Testcase $test failed</b> $bug_line<br>\n";
}
-
+
$html .= " [ ";
if ($failures_reported > 1) {
$html .= "<a href='#failure" . ($failures_reported - 1) . "'>" .
- "Previous Failure</a> | ";
+ "Previous Failure</a> | ";
}
-
+
$html .= "<a href='#failure" . ($failures_reported + 1) . "'>" .
- "Next Failure</a> | " .
+ "Next Failure</a> | " .
"<a href='#tippy_top'>Top of Page</a> ]<br>\n" .
- "<tt>$message</tt><br>\n";
-
+ "<tt>$message</tt><br>\n";
+
@failed_tests[$#failed_tests + 1] = $test;
-
+
}
sub dd {
-
+
if ($opt_trace) {
print ("-*- ", @_ , "\n");
}
-
+
}
sub status {
-
+
print ("-#- ", @_ , "\n");
-
+
}
sub int_handler {
my $resp;
-
+
do {
print ("\n*** User Break: Just [Q]uit, Quit and [R]eport, [C]ontinue ?");
$resp = <STDIN>;
} until ($resp =~ /[QqRrCc]/);
-
+
if ($resp =~ /[Qq]/) {
print ("User Exit. No results were generated.\n");
exit;
} elsif ($resp =~ /[Rr]/) {
$user_exit = 1;
}
-
+
}
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list