Merge pull request #601 from bocoup/generator-noise

Reduce noise in output of test generation tool
2016-04-26 14:12:21 -07:00 · 2016-04-26 14:12:21 -07:00 · efd84de3e7
parent 84d95077d0 73a7e23061
commit efd84de3e7
32 changed files with 332 additions and 246 deletions
--- a/test/language/expressions/arrow-function/dstr-ary-name-iter-val.js
+++ b/test/language/expressions/arrow-function/dstr-ary-name-iter-val.js
@ -5,7 +5,7 @@
 description: SingleNameBinding with normal value iteration (arrow function expression)
 es6id: 14.2.16
 flags: [generated]
-info: >
+info: |
    ArrowFunction : ArrowParameters => ConciseBody

    [...]
--- a/test/language/expressions/call/spread-err-sngl-err-expr-throws.js
+++ b/test/language/expressions/call/spread-err-sngl-err-expr-throws.js
@ -5,9 +5,8 @@
 description: Spread operator applied to the only argument when evaluation throws (CallExpression)
 es6id: 12.3.4.1
 features: [generators]
-
 flags: [generated]
-info: >
+info: |
    CallExpression : MemberExpression Arguments

    [...]
--- a/test/language/expressions/call/spread-sngl-iter.js
+++ b/test/language/expressions/call/spread-sngl-iter.js
@ -5,9 +5,8 @@
 description: Spread operator applied to the only argument with a valid iterator (CallExpression)
 es6id: 12.3.4.1
 features: [Symbol.iterator]
-
 flags: [generated]
-info: >
+info: |
    CallExpression : MemberExpression Arguments

    [...]
--- a/test/language/expressions/class/dstr-gen-meth-ary-name-iter-val.js
+++ b/test/language/expressions/class/dstr-gen-meth-ary-name-iter-val.js
@ -5,7 +5,7 @@
 description: SingleNameBinding with normal value iteration (class expression method)
 es6id: 14.5.16
 flags: [generated]
-info: >
+info: |
    ClassExpression : class BindingIdentifieropt ClassTail

    1. If BindingIdentifieropt is not present, let className be undefined.
--- a/test/language/expressions/class/dstr-gen-meth-static-ary-name-iter-val.js
+++ b/test/language/expressions/class/dstr-gen-meth-static-ary-name-iter-val.js
@ -5,7 +5,7 @@
 description: SingleNameBinding with normal value iteration (static class expression generator method)
 es6id: 14.5.16
 flags: [generated]
-info: >
+info: |
    ClassExpression : class BindingIdentifieropt ClassTail

    1. If BindingIdentifieropt is not present, let className be undefined.
--- a/test/language/expressions/class/dstr-meth-ary-name-iter-val.js
+++ b/test/language/expressions/class/dstr-meth-ary-name-iter-val.js
@ -5,7 +5,7 @@
 description: SingleNameBinding with normal value iteration (class expression method)
 es6id: 14.5.16
 flags: [generated]
-info: >
+info: |
    ClassExpression : class BindingIdentifieropt ClassTail

    1. If BindingIdentifieropt is not present, let className be undefined.
--- a/test/language/expressions/class/dstr-meth-static-ary-name-iter-val.js
+++ b/test/language/expressions/class/dstr-meth-static-ary-name-iter-val.js
@ -5,7 +5,7 @@
 description: SingleNameBinding with normal value iteration (static class expression method)
 es6id: 14.5.16
 flags: [generated]
-info: >
+info: |
    ClassExpression : class BindingIdentifieropt ClassTail

    1. If BindingIdentifieropt is not present, let className be undefined.
--- a/test/language/expressions/function/dstr-ary-name-iter-val.js
+++ b/test/language/expressions/function/dstr-ary-name-iter-val.js
@ -5,7 +5,7 @@
 description: SingleNameBinding with normal value iteration (function expression)
 es6id: 14.1.20
 flags: [generated]
-info: >
+info: |
    FunctionExpression : function ( FormalParameters ) { FunctionBody }

        [...]
--- a/test/language/expressions/generators/dstr-ary-name-iter-val.js
+++ b/test/language/expressions/generators/dstr-ary-name-iter-val.js
@ -5,7 +5,7 @@
 description: SingleNameBinding with normal value iteration (generator function expression)
 es6id: 14.4.14
 flags: [generated]
-info: >
+info: |
    GeneratorExpression : function * ( FormalParameters ) { GeneratorBody }

        [...]
--- a/test/language/expressions/new/spread-err-sngl-err-expr-throws.js
+++ b/test/language/expressions/new/spread-err-sngl-err-expr-throws.js
@ -5,9 +5,8 @@
 description: Spread operator applied to the only argument when evaluation throws (`new` operator)
 es6id: 12.3.3.1
 features: [generators]
-
 flags: [generated]
-info: >
+info: |
    MemberExpression : new MemberExpression Arguments

    1. Return EvaluateNew(MemberExpression, Arguments).
--- a/test/language/expressions/new/spread-sngl-iter.js
+++ b/test/language/expressions/new/spread-sngl-iter.js
@ -5,9 +5,8 @@
 description: Spread operator applied to the only argument with a valid iterator (`new` operator)
 es6id: 12.3.3.1
 features: [Symbol.iterator]
-
 flags: [generated]
-info: >
+info: |
    MemberExpression : new MemberExpression Arguments

    1. Return EvaluateNew(MemberExpression, Arguments).
--- a/test/language/expressions/object/dstr-gen-meth-ary-name-iter-val.js
+++ b/test/language/expressions/object/dstr-gen-meth-ary-name-iter-val.js
@ -5,7 +5,7 @@
 description: SingleNameBinding with normal value iteration (generator method)
 es6id: 14.4.13
 flags: [generated]
-info: >
+info: |
    GeneratorMethod :
        * PropertyName ( StrictFormalParameters ) { GeneratorBody }

--- a/test/language/expressions/object/dstr-meth-ary-name-iter-val.js
+++ b/test/language/expressions/object/dstr-meth-ary-name-iter-val.js
@ -5,7 +5,7 @@
 description: SingleNameBinding with normal value iteration (method)
 es6id: 14.3.8
 flags: [generated]
-info: >
+info: |
    MethodDefinition : PropertyName ( StrictFormalParameters ) { FunctionBody }

    [...]
--- a/test/language/expressions/super/spread-err-sngl-err-expr-throws.js
+++ b/test/language/expressions/super/spread-err-sngl-err-expr-throws.js
@ -5,9 +5,8 @@
 description: Spread operator applied to the only argument when evaluation throws (SuperCall)
 es6id: 12.3.5.1
 features: [generators]
-
 flags: [generated]
-info: >
+info: |
    SuperCall : super Arguments

    1. Let newTarget be GetNewTarget().
--- a/test/language/expressions/super/spread-sngl-iter.js
+++ b/test/language/expressions/super/spread-sngl-iter.js
@ -5,9 +5,8 @@
 description: Spread operator applied to the only argument with a valid iterator (SuperCall)
 es6id: 12.3.5.1
 features: [Symbol.iterator]
-
 flags: [generated]
-info: >
+info: |
    SuperCall : super Arguments

    1. Let newTarget be GetNewTarget().
--- a/test/language/statements/class/dstr-gen-meth-ary-name-iter-val.js
+++ b/test/language/statements/class/dstr-gen-meth-ary-name-iter-val.js
@ -5,7 +5,7 @@
 description: SingleNameBinding with normal value iteration (class expression method)
 es6id: 14.5.16
 flags: [generated]
-info: >
+info: |
    ClassDeclaration : class BindingIdentifier ClassTail

    1. Let className be StringValue of BindingIdentifier.
--- a/test/language/statements/class/dstr-gen-meth-static-ary-name-iter-val.js
+++ b/test/language/statements/class/dstr-gen-meth-static-ary-name-iter-val.js
@ -5,7 +5,7 @@
 description: SingleNameBinding with normal value iteration (static class expression generator method)
 es6id: 14.5.15
 flags: [generated]
-info: >
+info: |
    ClassDeclaration : class BindingIdentifier ClassTail

    1. Let className be StringValue of BindingIdentifier.
--- a/test/language/statements/class/dstr-meth-ary-name-iter-val.js
+++ b/test/language/statements/class/dstr-meth-ary-name-iter-val.js
@ -5,7 +5,7 @@
 description: SingleNameBinding with normal value iteration (class expression method)
 es6id: 14.5.15
 flags: [generated]
-info: >
+info: |
    ClassDeclaration : class BindingIdentifier ClassTail

    1. Let className be StringValue of BindingIdentifier.
--- a/test/language/statements/class/dstr-meth-static-ary-name-iter-val.js
+++ b/test/language/statements/class/dstr-meth-static-ary-name-iter-val.js
@ -5,7 +5,7 @@
 description: SingleNameBinding with normal value iteration (static class expression method)
 es6id: 14.5.15
 flags: [generated]
-info: >
+info: |
    ClassDeclaration : class BindingIdentifier ClassTail

    1. Let className be StringValue of BindingIdentifier.
--- a/test/language/statements/const/dstr-ary-name-iter-val.js
+++ b/test/language/statements/const/dstr-ary-name-iter-val.js
@ -5,7 +5,7 @@
 description: SingleNameBinding with normal value iteration (`const` statement)
 es6id: 13.3.1.4
 flags: [generated]
-info: >
+info: |
    LexicalBinding : BindingPattern Initializer

    1. Let rhs be the result of evaluating Initializer.
--- a/test/language/statements/function/dstr-ary-name-iter-val.js
+++ b/test/language/statements/function/dstr-ary-name-iter-val.js
@ -5,7 +5,7 @@
 description: SingleNameBinding with normal value iteration (function declaration)
 es6id: 14.1.19
 flags: [generated]
-info: >
+info: |
    FunctionDeclaration :
        function BindingIdentifier ( FormalParameters ) { FunctionBody }

--- a/test/language/statements/generators/dstr-ary-name-iter-val.js
+++ b/test/language/statements/generators/dstr-ary-name-iter-val.js
@ -5,7 +5,7 @@
 description: SingleNameBinding with normal value iteration (generator function declaration)
 es6id: 14.4.12
 flags: [generated]
-info: >
+info: |
    GeneratorDeclaration : function * ( FormalParameters ) { GeneratorBody }

        [...]
--- a/test/language/statements/let/dstr-ary-name-iter-val.js
+++ b/test/language/statements/let/dstr-ary-name-iter-val.js
@ -5,7 +5,7 @@
 description: SingleNameBinding with normal value iteration (`let` statement)
 es6id: 13.3.1.4
 flags: [generated]
-info: >
+info: |
    LexicalBinding : BindingPattern Initializer

    1. Let rhs be the result of evaluating Initializer.
--- a/test/language/statements/variable/dstr-ary-name-iter-val.js
+++ b/test/language/statements/variable/dstr-ary-name-iter-val.js
@ -5,7 +5,7 @@
 description: SingleNameBinding with normal value iteration (`var` statement)
 es6id: 13.3.2.4
 flags: [generated]
-info: >
+info: |
    VariableDeclaration : BindingPattern Initializer

    1. Let rhs be the result of evaluating Initializer.
--- a/tools/generation/lib/template.py
+++ b/tools/generation/lib/template.py
@ -20,7 +20,11 @@ def indent(text, prefix = '    '):
    else:
        lines = text.split('\n')

-    return prefix + ('\n' + prefix).join(lines)
+    indented = map(
+        lambda line: line if len(line) == 0 else prefix + line,
+        lines)
+
+    return '\n'.join(indented)

 class Template:
    def __init__(self, filename):
@ -119,7 +123,7 @@ class Template:
        features += case_values['meta'].get('features', [])
        features += self.attribs['meta'].get('features', [])
        if len(features):
-            lines += ['features: ' + yaml.dump(features)]
+            lines += ['features: ' + yaml.dump(features).strip()]

        flags = ['generated']
        flags += case_values['meta'].get('flags', [])
@ -145,7 +149,7 @@ class Template:
            info.append(indent(case_values['meta']['info']))

        if len(info):
-            lines.append('info: >')
+            lines.append('info: |')
            lines += info

        lines.append('---*/')
--- a/tools/generation/test/expected/normal/features-normal.js
+++ b/tools/generation/test/expected/normal/features-normal.js
@ -0,0 +1,14 @@
+// This file was procedurally generated from the following sources:
+// - tools/generation/test/fixtures/normal.case
+// - tools/generation/test/fixtures/normal/features.template
+/*---
+description: foobar (First template name)
+es6id: 1.2.3
+features: [f1]
+flags: [generated, a, b]
+includes: [foo.js]
+info: |
+    case info
+---*/
+
+'This is "teardown" code.';
--- a/tools/generation/test/expected/normal/info-multiline-folding-normal.js
+++ b/tools/generation/test/expected/normal/info-multiline-folding-normal.js
@ -0,0 +1,36 @@
+// This file was procedurally generated from the following sources:
+// - tools/generation/test/fixtures/normal.case
+// - tools/generation/test/fixtures/normal/info-multiline-folding.template
+/*---
+description: foobar (First template name)
+es6id: 1.2.3
+flags: [generated, a, b]
+includes: [foo.js]
+info: |
+    This is an "info" field with an
+
+    empty line
+    Trailing white space in the template: 
+    should be preserved:	
+     
+      
+       
+        
+    	
+    		
+    	 	  
+
+    case info
+---*/
+
+// Trailing white space in the test body: 
+// should be preserved:	
+ 
+  
+   
+    
+	
+		
+	 	  
+
+'This is "teardown" code.';
--- a/tools/generation/test/expected/normal/nested/path2-normal.js
+++ b/tools/generation/test/expected/normal/nested/path2-normal.js
@ -6,7 +6,7 @@ description: foobar (Second template name)
 esid: sec-a-generic-id
 flags: [generated, a, b]
 includes: [foo.js, bar.js]
-info: >
+info: |
    template info

    case info
--- a/tools/generation/test/expected/normal/no-info-normal.js
+++ b/tools/generation/test/expected/normal/no-info-normal.js
@ -6,7 +6,7 @@ description: foobar (First template name)
 es6id: 1.2.3
 flags: [generated, a, b]
 includes: [foo.js]
-info: >
+info: |
    case info
 ---*/

--- a/tools/generation/test/expected/normal/path1-normal.js
+++ b/tools/generation/test/expected/normal/path1-normal.js
@ -6,7 +6,7 @@ description: foobar (First template name)
 es6id: 1.2.3
 flags: [generated, a, b, c, d]
 includes: [foo.js]
-info: >
+info: |
    template info

    case info
--- a/tools/generation/test/fixtures/normal/features.template
+++ b/tools/generation/test/fixtures/normal/features.template
@ -0,0 +1,8 @@
+// Copyright (C) 2016 the V8 project authors. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+/*---
+name: First template name
+path: normal/features-
+es6id: 1.2.3
+features: [f1]
+---*/
--- a/tools/generation/test/fixtures/normal/info-multiline-folding.template
+++ b/tools/generation/test/fixtures/normal/info-multiline-folding.template
@ -0,0 +1,30 @@
+// Copyright (C) 2016 the V8 project authors. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+/*---
+name: First template name
+path: normal/info-multiline-folding-
+es6id: 1.2.3
+info: |
+    This is an "info" field with an
+
+    empty line
+    Trailing white space in the template: 
+    should be preserved:	
+     
+      
+       
+        
+    	
+    		
+    	 	  
+---*/
+
+// Trailing white space in the test body: 
+// should be preserved:	
+ 
+  
+   
+    
+	
+		
+