aboutsummaryrefslogtreecommitdiff
path: root/test cases
diff options
context:
space:
mode:
authorMarc-André Lureau <marcandre.lureau@redhat.com>2020-07-13 12:52:39 +0400
committerJussi Pakkanen <jpakkane@gmail.com>2020-07-19 17:53:32 +0300
commitaa0d75deaee925b9ceb3d98ef8f5de0167587c71 (patch)
treee5363513b287a0b80eef279499981f0eda762bfe /test cases
parent998c78fb0a404f34512414d93b08cf45166be357 (diff)
downloadmeson-aa0d75deaee925b9ceb3d98ef8f5de0167587c71.zip
meson-aa0d75deaee925b9ceb3d98ef8f5de0167587c71.tar.gz
meson-aa0d75deaee925b9ceb3d98ef8f5de0167587c71.tar.bz2
Stabilize keyval module
We have experimented with the module for about a year in a qemu branch (https://wiki.qemu.org/Features/Meson), and we would like to start moving the build system to meson. For that, keyval should have the stability guarantees. Cc: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'test cases')
-rw-r--r--test cases/common/222 source set realistic example/meson.build2
-rw-r--r--test cases/keyval/1 basic/meson.build2
-rw-r--r--test cases/keyval/2 subdir/dir/meson.build2
-rw-r--r--test cases/keyval/3 load_config files/dir/meson.build2
-rw-r--r--test cases/keyval/4 load_config builddir/meson.build2
5 files changed, 5 insertions, 5 deletions
diff --git a/test cases/common/222 source set realistic example/meson.build b/test cases/common/222 source set realistic example/meson.build
index 106b81d..d986b99 100644
--- a/test cases/common/222 source set realistic example/meson.build
+++ b/test cases/common/222 source set realistic example/meson.build
@@ -9,7 +9,7 @@ if cppid == 'pgi'
endif
ss = import('sourceset')
-keyval = import('unstable-keyval')
+keyval = import('keyval')
zlib = declare_dependency(compile_args: '-DZLIB=1')
another = declare_dependency(compile_args: '-DANOTHER=1')
diff --git a/test cases/keyval/1 basic/meson.build b/test cases/keyval/1 basic/meson.build
index fc7ddb3..c3e4466 100644
--- a/test cases/keyval/1 basic/meson.build
+++ b/test cases/keyval/1 basic/meson.build
@@ -1,6 +1,6 @@
project('keyval basic test')
-k = import('unstable-keyval')
+k = import('keyval')
conf = k.load('.config')
if not conf.has_key('CONFIG_VAL1')
diff --git a/test cases/keyval/2 subdir/dir/meson.build b/test cases/keyval/2 subdir/dir/meson.build
index dc1b478..291ad93 100644
--- a/test cases/keyval/2 subdir/dir/meson.build
+++ b/test cases/keyval/2 subdir/dir/meson.build
@@ -1,5 +1,5 @@
-k = import('unstable-keyval')
+k = import('keyval')
conf = k.load(meson.source_root() / '.config')
diff --git a/test cases/keyval/3 load_config files/dir/meson.build b/test cases/keyval/3 load_config files/dir/meson.build
index 43fba13..adc5289 100644
--- a/test cases/keyval/3 load_config files/dir/meson.build
+++ b/test cases/keyval/3 load_config files/dir/meson.build
@@ -1,5 +1,5 @@
-k = import('unstable-keyval')
+k = import('keyval')
conf = k.load(files('config'))
diff --git a/test cases/keyval/4 load_config builddir/meson.build b/test cases/keyval/4 load_config builddir/meson.build
index 1bb0285..6bd83db 100644
--- a/test cases/keyval/4 load_config builddir/meson.build
+++ b/test cases/keyval/4 load_config builddir/meson.build
@@ -1,6 +1,6 @@
project('keyval builddir test')
-k = import('unstable-keyval')
+k = import('keyval')
out_conf = configure_file(input: 'config', output: 'out-config', copy: true)
conf = k.load(out_conf)