aboutsummaryrefslogtreecommitdiff
path: root/test cases
diff options
context:
space:
mode:
authorMarc-André Lureau <marcandre.lureau@redhat.com>2019-07-24 11:30:35 +0400
committerJussi Pakkanen <jpakkane@gmail.com>2019-07-31 21:42:24 +0300
commit06aaffa4e14322274fe28184d159adec1142b1cb (patch)
treec5dc412201bbb42635b840f0d94ecafa2b9d9d3b /test cases
parent679ddb0ae780bfd4d81c586b0512255c0d1e24b6 (diff)
downloadmeson-06aaffa4e14322274fe28184d159adec1142b1cb.zip
meson-06aaffa4e14322274fe28184d159adec1142b1cb.tar.gz
meson-06aaffa4e14322274fe28184d159adec1142b1cb.tar.bz2
Allow kconfig to read from configure_file()
At configure time, kconfig can read from configure_file(). "test cases/kconfig/4 load_config builddir/meson.build" was already showing a workaround, now it actually can take configure_file input directly.
Diffstat (limited to 'test cases')
-rw-r--r--test cases/kconfig/4 load_config builddir/meson.build4
1 files changed, 2 insertions, 2 deletions
diff --git a/test cases/kconfig/4 load_config builddir/meson.build b/test cases/kconfig/4 load_config builddir/meson.build
index 93136ba..1924d23 100644
--- a/test cases/kconfig/4 load_config builddir/meson.build
+++ b/test cases/kconfig/4 load_config builddir/meson.build
@@ -2,8 +2,8 @@ project('kconfig builddir test')
k = import('unstable-kconfig')
-configure_file(input: 'config', output: 'out-config', copy: true)
-conf = k.load(meson.build_root() / 'out-config')
+out_conf = configure_file(input: 'config', output: 'out-config', copy: true)
+conf = k.load(out_conf)
if not conf.has_key('CONFIG_IS_SET')
error('Expected CONFIG_IS_SET to be set, but it wasn\'t')