summaryrefslogtreecommitdiff
path: root/test cases/frameworks
diff options
context:
space:
mode:
authorNirbheek Chauhan <nirbheek@centricular.com>2016-11-11 11:13:39 +0530
committerJussi Pakkanen <jpakkane@gmail.com>2016-11-12 11:51:37 -0500
commit3a84136268392a09be671af3fc228761a4d25cff (patch)
tree4252f3b3a9a983b77dd3759ea039b64bc30075bf /test cases/frameworks
parent1e0ae0a083cc454dad64f9195e7b5e08b80f9bd9 (diff)
downloadmeson-3a84136268392a09be671af3fc228761a4d25cff.tar.gz
Fix regex used in custom target evaluation
Instead of using a whitelist, use a blacklist. Also print a more useful error if the regex fails to match. Use an underscore in the gir test to trigger this. Fixes #436
Diffstat (limited to 'test cases/frameworks')
-rw-r--r--test cases/frameworks/7 gnome/gir/meson.build2
-rw-r--r--test cases/frameworks/7 gnome/installed_files.txt2
2 files changed, 2 insertions, 2 deletions
diff --git a/test cases/frameworks/7 gnome/gir/meson.build b/test cases/frameworks/7 gnome/gir/meson.build
index a5130621d..51bbbab54 100644
--- a/test cases/frameworks/7 gnome/gir/meson.build
+++ b/test cases/frameworks/7 gnome/gir/meson.build
@@ -1,7 +1,7 @@
libsources = ['meson-sample.c', 'meson-sample.h']
girlib = shared_library(
- 'girlib',
+ 'gir_lib',
sources : libsources,
dependencies : gobj,
install : true
diff --git a/test cases/frameworks/7 gnome/installed_files.txt b/test cases/frameworks/7 gnome/installed_files.txt
index c922f8baf..a18e4450d 100644
--- a/test cases/frameworks/7 gnome/installed_files.txt
+++ b/test cases/frameworks/7 gnome/installed_files.txt
@@ -3,6 +3,6 @@ usr/include/enums2.h
usr/include/enums3.h
usr/include/marshaller.h
usr/lib/girepository-1.0/Meson-1.0.typelib
-usr/lib/libgirlib.so
+usr/lib/libgir_lib.so
usr/share/gir-1.0/Meson-1.0.gir
usr/share/glib-2.0/schemas/com.github.meson.gschema.xml