summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorMike Pennisi <mike@mikepennisi.com>2016-04-25 17:06:51 -0400
committerMike Pennisi <mike@mikepennisi.com>2016-04-26 13:52:54 -0400
commit82051d8f6a533e17a636f185c4e11f859c48b323 (patch)
tree0dc6c84bfd3df68998bd2d37c7d000c9ba64d6df /tools
parent84d95077d0efb01f236a88340db3b5ef06c0e137 (diff)
downloadqtdeclarative-testsuites-82051d8f6a533e17a636f185c4e11f859c48b323.tar.gz
[generation] Strip whitespace from generated YAML
Diffstat (limited to 'tools')
-rw-r--r--tools/generation/lib/template.py2
-rw-r--r--tools/generation/test/expected/normal/features-normal.js14
-rw-r--r--tools/generation/test/fixtures/normal/features.template8
3 files changed, 23 insertions, 1 deletions
diff --git a/tools/generation/lib/template.py b/tools/generation/lib/template.py
index fa891f00b..bdd3eb1bc 100644
--- a/tools/generation/lib/template.py
+++ b/tools/generation/lib/template.py
@@ -119,7 +119,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', [])
diff --git a/tools/generation/test/expected/normal/features-normal.js b/tools/generation/test/expected/normal/features-normal.js
new file mode 100644
index 000000000..edc8a5a51
--- /dev/null
+++ 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.';
diff --git a/tools/generation/test/fixtures/normal/features.template b/tools/generation/test/fixtures/normal/features.template
new file mode 100644
index 000000000..ce2dcc2b7
--- /dev/null
+++ 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]
+---*/