Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(74)

Side by Side Diff: test/test262/harness-adapt.js

Issue 6826036: Bring test262 expectations up-to-date. (Closed) Base URL: https://v8.googlecode.com/svn/branches/bleeding_edge
Patch Set: Created 9 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | test/test262/test262.status » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2011 the V8 project authors. All rights reserved. 1 // Copyright 2011 the V8 project authors. All rights reserved.
2 // Redistribution and use in source and binary forms, with or without 2 // Redistribution and use in source and binary forms, with or without
3 // modification, are permitted provided that the following conditions are 3 // modification, are permitted provided that the following conditions are
4 // met: 4 // met:
5 // 5 //
6 // * Redistributions of source code must retain the above copyright 6 // * Redistributions of source code must retain the above copyright
7 // notice, this list of conditions and the following disclaimer. 7 // notice, this list of conditions and the following disclaimer.
8 // * Redistributions in binary form must reproduce the above 8 // * Redistributions in binary form must reproduce the above
9 // copyright notice, this list of conditions and the following 9 // copyright notice, this list of conditions and the following
10 // disclaimer in the documentation and/or other materials provided 10 // disclaimer in the documentation and/or other materials provided
(...skipping 25 matching lines...) Expand all
36 this.id = id; 36 this.id = id;
37 this.path = path; 37 this.path = path;
38 this.description = description; 38 this.description = description;
39 this.result = result; 39 this.result = result;
40 this.error = error; 40 this.error = error;
41 this.code = codeString; 41 this.code = codeString;
42 this.pre = preconditionString; 42 this.pre = preconditionString;
43 } 43 }
44 44
45 Test262Error.prototype.toString = function() { 45 Test262Error.prototype.toString = function() {
46 return this.result; 46 return this.result + " " + error;
47 } 47 }
48 48
49 function registerTest(test) { 49 function registerTest(test) {
50 if (!(test.precondition && !test.precondition())) { 50 if (!(test.precondition && !test.precondition())) {
51 var error; 51 var error;
52 try { 52 try {
53 var res = test.test.call($this); 53 var res = test.test.call($this);
54 } catch(e) { 54 } catch(e) {
55 print(e);
56 res = 'fail'; error = e; 55 res = 'fail'; error = e;
Rico 2011/04/11 13:16:35 Not from this cl, but put these on seperate lines
Martin Maly 2011/04/11 13:54:46 Done.
57 } 56 }
58 var retVal = /^s/i.test(test.id) 57 var retVal = /^s/i.test(test.id)
59 ? (res === true || typeof res == 'undefined' ? 'pass' : 'fail') 58 ? (res === true || typeof res == 'undefined' ? 'pass' : 'fail')
60 : (res === true ? 'pass' : 'fail'); 59 : (res === true ? 'pass' : 'fail');
61 60
62 if (retVal != 'pass') { 61 if (retVal != 'pass') {
62 var precondition = (test.precondition !== undefined)
63 ? test.precondition.toString()
64 : '';
65
63 throw new Test262Error( 66 throw new Test262Error(
64 test.id, 67 test.id,
65 test.path, 68 test.path,
66 test.description, 69 test.description,
67 test.test.toString(), 70 test.test.toString(),
68 (test.precondition !== undefined) 71 precondition,
69 ? test.precondition.toString()
70 : '',
71 retVal, 72 retVal,
72 error); 73 error);
73 } 74 }
74 } 75 }
75 } 76 }
76 77
77 return { 78 return {
78 registerTest: registerTest 79 registerTest: registerTest
79 } 80 }
80 })(); 81 })();
OLDNEW
« no previous file with comments | « no previous file | test/test262/test262.status » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698