Phillip Smyth pushed to branch issue-638-validate-all-files at BuildStream / buildstream
Commits:
10 changed files:
- NEWS
- + tests/frontend/project_default/elements/target.bst
- + tests/frontend/project_default/elements/target2.bst
- + tests/frontend/project_default/project.conf
- + tests/frontend/project_fail/elements/compose-all.bst
- + tests/frontend/project_fail/elements/import-dev.bst
- + tests/frontend/project_fail/elements/target.bst
- + tests/frontend/project_fail/files/dev-files/usr/include/pony.h
- + tests/frontend/project_fail/project.conf
- tests/frontend/show.py
Changes:
| ... | ... | @@ -12,6 +12,10 @@ buildstream 1.3.1 |
| 12 | 12 |
specific. Recommendation if you are building in Linux is to use the
|
| 13 | 13 |
ones being used in freedesktop-sdk project, for example
|
| 14 | 14 |
|
| 15 |
+ o Running `bst show` without elements specified will now attempt to show
|
|
| 16 |
+ the default element defined in the projcet configuration.
|
|
| 17 |
+ If no default element is defined, all elements in the project will be shown
|
|
| 18 |
+ |
|
| 15 | 19 |
o All elements must now be suffixed with `.bst`
|
| 16 | 20 |
Attempting to use an element that does not have the `.bst` extension,
|
| 17 | 21 |
will result in a warning.
|
| 1 |
+kind: stack
|
|
| 2 |
+description: |
|
|
| 3 |
+ |
|
| 4 |
+ Main stack target for the bst build test
|
| 1 |
+kind: stack
|
|
| 2 |
+description: |
|
|
| 3 |
+ |
|
| 4 |
+ Main stack target for the bst build test
|
| 1 |
+# Project config for frontend build test
|
|
| 2 |
+name: test
|
|
| 3 |
+ |
|
| 4 |
+element-path: elements
|
|
| 5 |
+ |
|
| 6 |
+fatal-warnings:
|
|
| 7 |
+- bad-element-suffix
|
|
| 8 |
+ |
|
| 9 |
+defaults:
|
|
| 10 |
+ target-element: target2.bst
|
| 1 |
+kind: compose
|
|
| 2 |
+ |
|
| 3 |
+depends:
|
|
| 4 |
+- fileNAME: import-dev.bst
|
|
| 5 |
+ type: build
|
|
| 6 |
+ |
|
| 7 |
+config:
|
|
| 8 |
+ # Dont try running the sandbox, we dont have a
|
|
| 9 |
+ # runtime to run anything in this context.
|
|
| 10 |
+ integrate: False
|
| 1 |
+kind: import
|
|
| 2 |
+sources:
|
|
| 3 |
+- kind: local
|
|
| 4 |
+ path: files/dev-files
|
| 1 |
+kind: stack
|
|
| 2 |
+description: |
|
|
| 3 |
+ |
|
| 4 |
+ Main stack target for the bst build test
|
|
| 5 |
+ |
|
| 6 |
+depends:
|
|
| 7 |
+- compose-all.bst
|
| 1 |
+#ifndef __PONY_H__
|
|
| 2 |
+#define __PONY_H__
|
|
| 3 |
+ |
|
| 4 |
+#define PONY_BEGIN "Once upon a time, there was a pony."
|
|
| 5 |
+#define PONY_END "And they lived happily ever after, the end."
|
|
| 6 |
+ |
|
| 7 |
+#define MAKE_PONY(story) \
|
|
| 8 |
+ PONY_BEGIN \
|
|
| 9 |
+ story \
|
|
| 10 |
+ PONY_END
|
|
| 11 |
+ |
|
| 12 |
+#endif /* __PONY_H__ */
|
| 1 |
+# Project config for frontend build test
|
|
| 2 |
+name: test
|
|
| 3 |
+ |
|
| 4 |
+element-path: elements
|
| ... | ... | @@ -46,6 +46,27 @@ def test_show_invalid_element_path(cli, datafiles): |
| 46 | 46 |
'show',
|
| 47 | 47 |
"foo.bst"])
|
| 48 | 48 |
|
| 49 |
+ |
|
| 50 |
+@pytest.mark.datafiles(DATA_DIR + "_default")
|
|
| 51 |
+def test_show_default(cli, datafiles):
|
|
| 52 |
+ project = os.path.join(datafiles.dirname, datafiles.basename)
|
|
| 53 |
+ result = cli.run(project=project, silent=True, args=[
|
|
| 54 |
+ 'show'])
|
|
| 55 |
+ |
|
| 56 |
+ result.assert_success()
|
|
| 57 |
+ |
|
| 58 |
+ # Get the result output of "[state sha element]" and turn into a list
|
|
| 59 |
+ results = result.output.strip().split(" ")
|
|
| 60 |
+ expected = 'target2.bst'
|
|
| 61 |
+ assert results[2] == expected
|
|
| 62 |
+ |
|
| 63 |
+ |
|
| 64 |
+@pytest.mark.datafiles(DATA_DIR + "_fail")
|
|
| 65 |
+def test_show_fail(cli, datafiles):
|
|
| 66 |
+ project = os.path.join(datafiles.dirname, datafiles.basename)
|
|
| 67 |
+ result = cli.run(project=project, silent=True, args=[
|
|
| 68 |
+ 'show'])
|
|
| 69 |
+ |
|
| 49 | 70 |
result.assert_main_error(ErrorDomain.LOAD, LoadErrorReason.INVALID_DATA)
|
| 50 | 71 |
|
| 51 | 72 |
|