diff --git a/js/tests/js1_7/extensions/regress-355052-01.js b/js/tests/js1_7/extensions/regress-355052-01.js index 0c86a95e45b..1bd3ab65f75 100755 --- a/js/tests/js1_7/extensions/regress-355052-01.js +++ b/js/tests/js1_7/extensions/regress-355052-01.js @@ -53,7 +53,7 @@ function test() printBugNumber(BUGNUMBER); printStatus (summary); - expect = 'TypeError: NaN is not a function'; + expect = /TypeError: NaN is not a function/; actual = 'No Error'; try { @@ -64,7 +64,7 @@ function test() actual = ex + ''; } - reportCompare(expect, actual, summary); + reportMatch(expect, actual, summary); exitFunc ('test'); } diff --git a/js/tests/js1_7/extensions/regress-355052-02.js b/js/tests/js1_7/extensions/regress-355052-02.js index b733b85dabb..4952bdcb20e 100755 --- a/js/tests/js1_7/extensions/regress-355052-02.js +++ b/js/tests/js1_7/extensions/regress-355052-02.js @@ -52,8 +52,8 @@ function test() enterFunc ('test'); printBugNumber(BUGNUMBER); printStatus (summary); - - expect = 'TypeError: NaN is not a function'; + + expect = /TypeError: NaN is not a function/; actual = 'No Error'; try { @@ -64,7 +64,7 @@ function test() actual = ex + ''; } - reportCompare(expect, actual, summary); + reportMatch(expect, actual, summary); exitFunc ('test'); } diff --git a/js/tests/js1_7/extensions/regress-355052-03.js b/js/tests/js1_7/extensions/regress-355052-03.js index ba14738a1a4..eab29a8613a 100755 --- a/js/tests/js1_7/extensions/regress-355052-03.js +++ b/js/tests/js1_7/extensions/regress-355052-03.js @@ -52,8 +52,8 @@ function test() enterFunc ('test'); printBugNumber(BUGNUMBER); printStatus (summary); - - expect = 'TypeError: NaN is not a function'; + + expect = /TypeError: NaN is not a function/; actual = 'No Error'; try { @@ -70,7 +70,7 @@ function test() actual = ex + ''; } - reportCompare(expect, actual, summary); + reportMatch(expect, actual, summary); exitFunc ('test'); } diff --git a/js/tests/js1_7/regress/regress-352797-02.js b/js/tests/js1_7/regress/regress-352797-02.js index d944b870906..bd46ba0ff2e 100755 --- a/js/tests/js1_7/regress/regress-352797-02.js +++ b/js/tests/js1_7/regress/regress-352797-02.js @@ -40,7 +40,7 @@ var gTestfile = 'regress-352797-02.js'; var BUGNUMBER = 352797; var summary = 'Do not assert: OBJ_GET_CLASS(cx, obj) == &js_BlockClass'; var actual = 'No Crash'; -var expect = 'No Crash'; +var expect = /No Crash/; //----------------------------------------------------------------------------- @@ -60,11 +60,11 @@ function test() catch(ex) { printStatus('Note eval can no longer be called directly'); - expect = 'EvalError: function eval must be called directly, and not by way of a function of another name'; + expect = /EvalError: (f|F)unction (eval|"eval") must be called directly, and not by way of a function of another name/; actual = ex + ''; } - reportCompare(expect, actual, summary); + reportMatch(expect, actual, summary); exitFunc ('test'); } diff --git a/js/tests/js1_7/regress/regress-352870-03.js b/js/tests/js1_7/regress/regress-352870-03.js index e2d577326f7..2e2100b6080 100755 --- a/js/tests/js1_7/regress/regress-352870-03.js +++ b/js/tests/js1_7/regress/regress-352870-03.js @@ -53,7 +53,7 @@ function test() printBugNumber(BUGNUMBER); printStatus (summary); - expect = 'ReferenceError: k is not defined'; + expect = /ReferenceError: (k|"k") is not defined/; actual = ''; try { @@ -65,7 +65,7 @@ function test() { actual = ex + ''; } - reportCompare(expect, actual, summary); + reportMatch(expect, actual, summary); exitFunc ('test'); }