From adc074bd27b511091c21d3038ab35f934145cb27 Mon Sep 17 00:00:00 2001 From: Jeff Walden Date: Mon, 26 Aug 2013 14:05:17 -0700 Subject: [PATCH] Bug 907958 - Change a test to not expect exact error messages, only that the errors are SyntaxErrors. r=simple-test-fixup --HG-- extra : rebase_source : 106e9f5be720a0d781db3e4a94bc07926b02bf2e --- js/src/tests/js1_7/geniter/regress-345855.js | 8 +++---- js/src/tests/js1_7/lexical/regress-351515.js | 24 ++++++++++---------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/js/src/tests/js1_7/geniter/regress-345855.js b/js/src/tests/js1_7/geniter/regress-345855.js index 4e5bb669786..3cd10217de8 100644 --- a/js/src/tests/js1_7/geniter/regress-345855.js +++ b/js/src/tests/js1_7/geniter/regress-345855.js @@ -20,7 +20,7 @@ function test() printBugNumber(BUGNUMBER); printStatus (summary); - expect = 'SyntaxError: syntax error'; + expect = "SyntaxError"; try { eval('(function() {x = 12 + yield;})'); @@ -28,11 +28,11 @@ function test() } catch(ex) { - actual = ex + ''; + actual = ex.name; } reportCompare(expect, actual, summary + ': function() {x = 12 + yield;}'); - expect = 'SyntaxError: syntax error'; + expect = "SyntaxError"; try { eval('(function() {x = 12 + yield 42})'); @@ -40,7 +40,7 @@ function test() } catch(ex) { - actual = ex + ''; + actual = ex.name; } reportCompare(expect, actual, summary + ': function() {x = 12 + yield 42}'); diff --git a/js/src/tests/js1_7/lexical/regress-351515.js b/js/src/tests/js1_7/lexical/regress-351515.js index 4a455e51e49..403321df3c3 100644 --- a/js/src/tests/js1_7/lexical/regress-351515.js +++ b/js/src/tests/js1_7/lexical/regress-351515.js @@ -16,37 +16,37 @@ test(); try { - expect = 'SyntaxError: yield not in function'; + expect = "SyntaxError"; eval('yield = 1;'); actual = 'No Error'; } catch(ex) { - actual = ex + ''; + actual = ex.name; } reportCompare(expect, actual, summary + ': global: yield = 1'); try { - expect = 'SyntaxError: syntax error'; + expect = "SyntaxError"; eval('(function(){yield = 1;})'); actual = 'No Error'; } catch(ex) { - actual = ex + ''; + actual = ex.name; } reportCompare(expect, actual, summary + ': local: yield = 1'); try { - expect = 'SyntaxError: missing variable name'; + expect = "SyntaxError"; eval('let = 1;'); actual = 'No Error'; } catch(ex) { - actual = ex + ''; + actual = ex.name; } reportCompare(expect, actual, summary + ': global: let = 1'); @@ -58,38 +58,38 @@ function test() try { - expect = 'SyntaxError: missing formal parameter'; + expect = "SyntaxError"; eval('function f(yield, let) { return yield+let; }'); actual = 'No Error'; } catch(ex) { - actual = ex + ''; + actual = ex.name; } reportCompare(expect, actual, summary + ': function f(yield, let) { return yield+let; }'); try { - expect = 'SyntaxError: missing variable name'; + expect = "SyntaxError"; eval('var yield = 1;'); actual = 'No Error'; } catch(ex) { - actual = ex + ''; + actual = ex.name; } reportCompare(expect, actual, summary + ': function () {var yield;}'); try { - expect = 'SyntaxError: missing variable name'; + expect = "SyntaxError"; eval('var let = 1;'); actual = 'No Error'; } catch(ex) { - actual = ex + ''; + actual = ex.name; } reportCompare(expect, actual, summary + ': function () { var let;}');