Phillip Smyth pushed to branch issue-638-validate-all-files at BuildStream / buildstream
Commits:
-
40f1800a
by Phillip Smyth at 2018-12-10T17:46:09Z
9 changed files:
- + 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:
| 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,33 @@ 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 |
+ prev_dir = os.getcwd()
|
|
| 54 |
+ os.chdir(project)
|
|
| 55 |
+ result = cli.run(project=project, silent=True, args=[
|
|
| 56 |
+ 'show'])
|
|
| 57 |
+ os.chdir(prev_dir)
|
|
| 58 |
+ |
|
| 59 |
+ result.assert_success()
|
|
| 60 |
+ results = result.output.strip().splitlines()
|
|
| 61 |
+ expected = 'buildable ca4321107f0f529170d345af19372c57a6672f62afdcbdd36ca067b67124ef60 target2.bst'
|
|
| 62 |
+ if result.output.strip() != expected:
|
|
| 63 |
+ raise AssertionError("Expected output:\n{}\nInstead received output:\n{}"
|
|
| 64 |
+ .format(expected, result.output))
|
|
| 65 |
+ |
|
| 66 |
+ |
|
| 67 |
+@pytest.mark.datafiles(DATA_DIR + "_fail")
|
|
| 68 |
+def test_show_fail(cli, datafiles):
|
|
| 69 |
+ project = os.path.join(datafiles.dirname, datafiles.basename)
|
|
| 70 |
+ prev_dir = os.getcwd()
|
|
| 71 |
+ os.chdir(project)
|
|
| 72 |
+ result = cli.run(project=project, silent=True, args=[
|
|
| 73 |
+ 'show'])
|
|
| 74 |
+ os.chdir(prev_dir)
|
|
| 75 |
+ |
|
| 49 | 76 |
result.assert_main_error(ErrorDomain.LOAD, LoadErrorReason.INVALID_DATA)
|
| 50 | 77 |
|
| 51 | 78 |
|