diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2018-03-20 00:15:01 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-20 00:15:01 +0200 |
| commit | 657836b555ef03c1ad70a855498dee15da19c2dc (patch) | |
| tree | 25402a1b78ac09e70d9994a930590d5274ad9655 /test cases | |
| parent | d012b5b997e917a971bca1236a065453493c780d (diff) | |
| parent | 5f81d362078ec1f1de97fc55cdbebb69d5e37865 (diff) | |
| download | meson-657836b555ef03c1ad70a855498dee15da19c2dc.tar.gz | |
Merge pull request #3223 from sarum9in/rename
Add install_data() rename parameter
Diffstat (limited to 'test cases')
9 files changed, 13 insertions, 0 deletions
diff --git a/test cases/common/12 data/installed_files.txt b/test cases/common/12 data/installed_files.txt index ab1a98163..43bb0e5e2 100644 --- a/test cases/common/12 data/installed_files.txt +++ b/test cases/common/12 data/installed_files.txt @@ -2,6 +2,10 @@ usr/share/progname/datafile.dat usr/share/progname/fileobject_datafile.dat usr/share/progname/vanishing.dat usr/share/progname/vanishing2.dat +usr/share/data install test/renamed file.txt usr/share/data install test/somefile.txt +usr/share/data install test/some/nested/path.txt +usr/share/renamed/renamed 2.txt +usr/share/renamed/renamed 3.txt etc/etcfile.dat usr/bin/runscript.sh diff --git a/test cases/common/12 data/meson.build b/test cases/common/12 data/meson.build index 4528afee6..d855bbaf4 100644 --- a/test cases/common/12 data/meson.build +++ b/test cases/common/12 data/meson.build @@ -15,3 +15,9 @@ install_data(files('somefile.txt')) subdir('vanishing') install_data(sources : 'vanishing/vanishing2.dat', install_dir : 'share/progname') + +install_data(sources : 'to_be_renamed_1.txt', rename : 'renamed file.txt') +install_data(sources : ['vanishing/to_be_renamed_2.txt', 'to_be_renamed_3.txt'], + install_dir : 'share/renamed', + rename : ['renamed 2.txt', 'renamed 3.txt']) +install_data(sources : 'to_be_renamed_4.txt', rename : 'some/nested/path.txt') diff --git a/test cases/common/12 data/to_be_renamed_1.txt b/test cases/common/12 data/to_be_renamed_1.txt new file mode 100644 index 000000000..e69de29bb --- /dev/null +++ b/test cases/common/12 data/to_be_renamed_1.txt diff --git a/test cases/common/12 data/to_be_renamed_3.txt b/test cases/common/12 data/to_be_renamed_3.txt new file mode 100644 index 000000000..e69de29bb --- /dev/null +++ b/test cases/common/12 data/to_be_renamed_3.txt diff --git a/test cases/common/12 data/to_be_renamed_4.txt b/test cases/common/12 data/to_be_renamed_4.txt new file mode 100644 index 000000000..e69de29bb --- /dev/null +++ b/test cases/common/12 data/to_be_renamed_4.txt diff --git a/test cases/common/12 data/vanishing/to_be_renamed_2.txt b/test cases/common/12 data/vanishing/to_be_renamed_2.txt new file mode 100644 index 000000000..e69de29bb --- /dev/null +++ b/test cases/common/12 data/vanishing/to_be_renamed_2.txt diff --git a/test cases/failing/70 install_data rename bad size/file1.txt b/test cases/failing/70 install_data rename bad size/file1.txt new file mode 100644 index 000000000..e69de29bb --- /dev/null +++ b/test cases/failing/70 install_data rename bad size/file1.txt diff --git a/test cases/failing/70 install_data rename bad size/file2.txt b/test cases/failing/70 install_data rename bad size/file2.txt new file mode 100644 index 000000000..e69de29bb --- /dev/null +++ b/test cases/failing/70 install_data rename bad size/file2.txt diff --git a/test cases/failing/70 install_data rename bad size/meson.build b/test cases/failing/70 install_data rename bad size/meson.build new file mode 100644 index 000000000..c7cde087d --- /dev/null +++ b/test cases/failing/70 install_data rename bad size/meson.build @@ -0,0 +1,3 @@ +project('data install test', 'c') + +install_data(['file1.txt', 'file2.txt'], rename : 'just one name') |