wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 777589 - Fix regress-50447-1.js, don't work around it in the harness; r=sfink

Browse Source
This commit is contained in:
Terrence Cole 2012-07-27 18:16:11 -07:00
parent 3359fe7582
commit 19a18cad75
2 changed files with 5 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
js/src/tests/js1_5/extensions/regress-50447-1.js
View File

@ -99,14 +99,9 @@ function test2()
test file and assumes the path to the test case test file and assumes the path to the test case
is a subdirectory of the directory containing jsDriver.pl is a subdirectory of the directory containing jsDriver.pl
*/ */
var expectedLine = 114; var expectedLine = 109;
var expectedFileName = 'js1_5/extensions/regress-50447-1.js'; var expectedFileName = 'js1_5/extensions/regress-50447-1.js';
if (typeof document == "undefined") if (typeof document != "undefined") {
{
expectedFileName = './' + expectedFileName;
}
else
{
expectedFileName = document.location.href. expectedFileName = document.location.href.
replace(/[^\/]*(\?.*)$/, '') + replace(/[^\/]*(\?.*)$/, '') +
expectedFileName; expectedFileName;
@ -137,12 +132,7 @@ function test3()
enterFunc ("test3"); enterFunc ("test3");
var expectedFileName = 'js1_5/extensions/regress-50447-1.js'; var expectedFileName = 'js1_5/extensions/regress-50447-1.js';
if (typeof document == "undefined") if (typeof document != "undefined") {
{
expectedFileName = './' + expectedFileName;
}
else
{
expectedFileName = document.location.href. expectedFileName = document.location.href.
replace(/[^\/]*(\?.*)$/, '') + replace(/[^\/]*(\?.*)$/, '') +
expectedFileName; expectedFileName;
@ -168,7 +158,7 @@ function test4()
/* generate an error with only msg and filename properties */ /* generate an error with only msg and filename properties */
enterFunc ("test4"); enterFunc ("test4");
var expectedLine = 173; var expectedLine = 163;
var e = new InternalError ("msg", "file"); var e = new InternalError ("msg", "file");
reportCompare ("(new InternalError(\"msg\", \"file\", " + expectedLine + "))", reportCompare ("(new InternalError(\"msg\", \"file\", " + expectedLine + "))",

3
js/src/tests/lib/tests.py
View File

@ -86,8 +86,7 @@ class Test(object):
cmd = cmd + Test.prefix_command(dirname) cmd = cmd + Test.prefix_command(dirname)
if self.debugMode: if self.debugMode:
cmd += [ '-d' ] cmd += [ '-d' ]
# There is a test that requires the path to start with './'. cmd += [ '-f', self.path ]
cmd += [ '-f', './' + self.path ]
return cmd return cmd
def run(self, js_cmd_prefix, timeout=30.0): def run(self, js_cmd_prefix, timeout=30.0):