Phillip Smyth pushed to branch issue-638-validate-all-files at BuildStream / buildstream
Commits:
-
8eef20ed
by Phillip Smyth at 2018-11-07T15:57:13Z
7 changed files:
- tests/completions/completions.py
- + 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:
| ... | ... | @@ -103,7 +103,7 @@ def test_commands(cli, cmd, word_idx, expected): |
| 103 | 103 |
('bst --no-colors build -', 3, ['--all ', '--track ', '--track-all ',
|
| 104 | 104 |
'--track-except ',
|
| 105 | 105 |
'--track-cross-junctions ', '-J ',
|
| 106 |
- '--track-save ']),
|
|
| 106 |
+ '--track-save ', '--world ']),
|
|
| 107 | 107 |
|
| 108 | 108 |
# Test the behavior of completing after an option that has a
|
| 109 | 109 |
# parameter that cannot be completed, vs an option that has
|
| 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,17 @@ def test_show_invalid_element_path(cli, datafiles): |
| 46 | 46 |
'show',
|
| 47 | 47 |
"foo.bst"])
|
| 48 | 48 |
|
| 49 |
+ |
|
| 50 |
+@pytest.mark.datafiles(DATA_DIR + "_fail")
|
|
| 51 |
+def test_show_fail(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 |
+ '--all'])
|
|
| 58 |
+ os.chdir(prev_dir)
|
|
| 59 |
+ |
|
| 49 | 60 |
result.assert_main_error(ErrorDomain.LOAD, LoadErrorReason.INVALID_DATA)
|
| 50 | 61 |
|
| 51 | 62 |
|