diff options
| author | Daniel Pirch <dpirch@gmail.com> | 2018-08-09 19:27:45 +0200 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2018-08-17 00:33:38 +0300 |
| commit | 6ecd31af19dc537983311796929a9dd690632999 (patch) | |
| tree | bef19217113e7a5f9e17bddddb047aedddad2694 /test cases | |
| parent | b400cbe058df10bc37e628305c72c574177062e2 (diff) | |
| download | meson-6ecd31af19dc537983311796929a9dd690632999.zip meson-6ecd31af19dc537983311796929a9dd690632999.tar.gz meson-6ecd31af19dc537983311796929a9dd690632999.tar.bz2 | |
wraptool: fix manual selection of wrap file to promote
Fixed manually promoting wrap files with a full path, e.g.
`meson wrap promote subprojects/s1/subprojects/projname.wrap`,
which resulted in an error before (new test added:
`./run_unittests.py AllPlatformTests.test_subproject_promotion_wrap`).
Additionally, running promote with an invalid subproject path now fails
properly. Before, it just silently did nothing (added to test:
`./run_unittests.py AllPlatformTests.test_subproject_promotion`).
Diffstat (limited to 'test cases')
5 files changed, 13 insertions, 0 deletions
diff --git a/test cases/unit/42 promote wrap/meson.build b/test cases/unit/42 promote wrap/meson.build new file mode 100644 index 0000000..066cf36 --- /dev/null +++ b/test cases/unit/42 promote wrap/meson.build @@ -0,0 +1,5 @@ +project('promotion test', 'c') + +subproject('s1') +subproject('s2') + diff --git a/test cases/unit/42 promote wrap/subprojects/s1/meson.build b/test cases/unit/42 promote wrap/subprojects/s1/meson.build new file mode 100644 index 0000000..3d1f5bc --- /dev/null +++ b/test cases/unit/42 promote wrap/subprojects/s1/meson.build @@ -0,0 +1,2 @@ +project('s1', 'c') + diff --git a/test cases/unit/42 promote wrap/subprojects/s1/subprojects/ambiguous/meson.build b/test cases/unit/42 promote wrap/subprojects/s1/subprojects/ambiguous/meson.build new file mode 100644 index 0000000..296adff --- /dev/null +++ b/test cases/unit/42 promote wrap/subprojects/s1/subprojects/ambiguous/meson.build @@ -0,0 +1,2 @@ +project('ambiguous', 'c') + diff --git a/test cases/unit/42 promote wrap/subprojects/s2/meson.build b/test cases/unit/42 promote wrap/subprojects/s2/meson.build new file mode 100644 index 0000000..b5db634 --- /dev/null +++ b/test cases/unit/42 promote wrap/subprojects/s2/meson.build @@ -0,0 +1,2 @@ +project('s2', 'c') + diff --git a/test cases/unit/42 promote wrap/subprojects/s2/subprojects/ambiguous.wrap b/test cases/unit/42 promote wrap/subprojects/s2/subprojects/ambiguous.wrap new file mode 100644 index 0000000..09ba4e8 --- /dev/null +++ b/test cases/unit/42 promote wrap/subprojects/s2/subprojects/ambiguous.wrap @@ -0,0 +1,2 @@ +The contents of this wrap file are never evaluated so they +can be anything. |