aboutsummaryrefslogtreecommitdiff
path: root/test cases/common
diff options
context:
space:
mode:
authorXavier Claessens <xavier.claessens@collabora.com>2020-05-28 13:22:57 -0400
committerJussi Pakkanen <jpakkane@gmail.com>2020-06-21 23:39:12 +0300
commite353b2e8d48c8ffce579342fac9ccfc62127bec8 (patch)
tree0aaf8f6f46ade428317a5cfe8013fda4cb31479a /test cases/common
parent246e5437aaf213401a22361a55c46e70a4eb505d (diff)
downloadmeson-e353b2e8d48c8ffce579342fac9ccfc62127bec8.zip
meson-e353b2e8d48c8ffce579342fac9ccfc62127bec8.tar.gz
meson-e353b2e8d48c8ffce579342fac9ccfc62127bec8.tar.bz2
wrap: Add patch_directory support
Copy a tree instead of extracting an archive. Closes: #7216
Diffstat (limited to 'test cases/common')
-rw-r--r--test cases/common/157 wrap file should not failed/meson.build2
-rw-r--r--test cases/common/157 wrap file should not failed/subprojects/packagefiles/foo-1.0/meson.build2
-rw-r--r--test cases/common/157 wrap file should not failed/subprojects/patchdir.wrap9
3 files changed, 13 insertions, 0 deletions
diff --git a/test cases/common/157 wrap file should not failed/meson.build b/test cases/common/157 wrap file should not failed/meson.build
index cffce2f..48d1068 100644
--- a/test cases/common/157 wrap file should not failed/meson.build
+++ b/test cases/common/157 wrap file should not failed/meson.build
@@ -12,3 +12,5 @@ libbar = bar.get_variable('libbar')
executable('grabprog', files('src/subprojects/prog.c'))
executable('grabprog2', files('src/subprojects/foo/prog2.c'))
subdir('src')
+
+subproject('patchdir')
diff --git a/test cases/common/157 wrap file should not failed/subprojects/packagefiles/foo-1.0/meson.build b/test cases/common/157 wrap file should not failed/subprojects/packagefiles/foo-1.0/meson.build
new file mode 100644
index 0000000..dbaf91f
--- /dev/null
+++ b/test cases/common/157 wrap file should not failed/subprojects/packagefiles/foo-1.0/meson.build
@@ -0,0 +1,2 @@
+project('static lib patchdir', 'c')
+libfoo = static_library('foo', 'foo.c')
diff --git a/test cases/common/157 wrap file should not failed/subprojects/patchdir.wrap b/test cases/common/157 wrap file should not failed/subprojects/patchdir.wrap
new file mode 100644
index 0000000..1a2134c
--- /dev/null
+++ b/test cases/common/157 wrap file should not failed/subprojects/patchdir.wrap
@@ -0,0 +1,9 @@
+[wrap-file]
+directory = foo-1.0-patchdir
+
+source_url = http://something.invalid
+source_filename = foo-1.0.tar.xz
+source_hash = 9ed8f67d75e43d3be161efb6eddf30dd01995a958ca83951ea64234bac8908c1
+lead_directory_missing = true
+
+patch_directory = foo-1.0