meson: fix tests on windows

The tests call chmod unconditionally, which is obviously problematic on Windows. I have an idea for a more robust fix in Meson, but in the mean time we can avoid the problem by not going into the test directory if kyua and atf_sh aren't found or are disabled.
Merge pull request 'meson: use a feature option for tests instead of boolean' (#244 ) from dcbaker/pkgconf:tests-feature into master
2022-08-26 10:03:49 -07:00 · 2022-08-20 13:27:45 +00:00 · 2022-08-17 11:07:44 -07:00 · 2022-08-16 20:41:10 +00:00 · 2022-08-16 19:50:26 +00:00
4 changed files with 13 additions and 9 deletions
--- a/cli/bomtool/main.c
+++ b/cli/bomtool/main.c
@ -356,6 +356,7 @@ main(int argc, char *argv[])
 	}

 out:
+	pkgconf_solution_free(&pkg_client, &world);
 	pkgconf_queue_free(&pkgq);
 	pkgconf_cross_personality_deinit(personality);
 	pkgconf_client_deinit(&pkg_client);
--- a/configure.ac
+++ b/configure.ac
@ -12,7 +12,7 @@ dnl implied.  In no event shall the authors be liable for any damages arising
 dnl from the use of this software.

 AC_PREREQ([2.71])
-AC_INIT([pkgconf],[1.9.2],[https://github.com/pkgconf/pkgconf/issues/new])
+AC_INIT([pkgconf],[1.9.3],[https://github.com/pkgconf/pkgconf/issues/new])
 AC_CONFIG_SRCDIR([cli/main.c])
 AC_CONFIG_MACRO_DIR([m4])
 AX_CHECK_COMPILE_FLAG([-Wall], [CFLAGS="$CFLAGS -Wall"])
--- a/meson.build
+++ b/meson.build
@ -1,7 +1,7 @@
 project('pkgconf', 'c',
-  version : '1.9.2',
+  version : '1.9.3',
  license : 'ISC',
-  meson_version : '>=0.47',
+  meson_version : '>=0.49',
  default_options : ['c_std=c99'],
 )

@ -117,9 +117,10 @@ pkgconf_exe = executable('pkgconf',
  c_args: build_static,
  install : true)

-if get_option('tests')
-  kyua_exe = find_program('kyua')
-  atf_sh_exe = find_program('atf-sh')
+with_tests = get_option('tests')
+kyua_exe = find_program('kyua', required : with_tests, disabler : true)
+atf_sh_exe = find_program('atf-sh', required : with_tests, disabler : true)
+if kyua_exe.found() and atf_sh_exe.found()
  kyuafile = configure_file(input : 'Kyuafile.in', output : 'Kyuafile', configuration : cdata)
  test('kyua', kyua_exe, args : ['--config=none', 'test', '--kyuafile', kyuafile, '--build-root', meson.current_build_dir()])
  subdir('tests')
--- a/meson_options.txt
+++ b/meson_options.txt
@ -1,3 +1,5 @@
-option('tests', type: 'boolean', value: true,
-  description: 'Build tests which depends upon the kyua framework'
-)
+option(
+  'tests',
+  type: 'feature',
+  description: 'Build tests which depends upon the kyua framework',
+)
Author	SHA1	Message	Date
Dylan Baker	1cd84fec98	meson: fix tests on windows The tests call chmod unconditionally, which is obviously problematic on Windows. I have an idea for a more robust fix in Meson, but in the mean time we can avoid the problem by not going into the test directory if kyua and atf_sh aren't found or are disabled.	2022-08-26 10:03:49 -07:00
Ariadne Conill	0226cdda6d	Merge pull request 'meson: use a feature option for tests instead of boolean' (#244 ) from dcbaker/pkgconf:tests-feature into master Reviewed-on: ariadne/pkgconf#244	2022-08-20 13:27:45 +00:00
Dylan Baker	fa803c7ecd	meson: use a feature option for tests instead of boolean This allows tests to be autodetected gracefully, which is particularly convenient for kyua and atf_sh which are fairly painful to build and install by hand. Those who want to ensure tests are enabled or disabled may pass `-Dtests=enabled` or `-Dtests=disabled` respectively. This does require a modest bump in the required meson version to 0.49, which was released at the end of 2018, so roughly 4 years ago.	2022-08-17 11:07:44 -07:00
Ariadne Conill	bddf1641f8	bomtool: fix ASan issues	2022-08-16 20:41:10 +00:00
Ariadne Conill	8754bdfe09	pkgconf 1.9.3.	2022-08-16 19:50:26 +00:00