From 2f804e9074f391e8efbf4a2deb9f1cc3ebaaaf2e Mon Sep 17 00:00:00 2001 From: Nirbheek Chauhan Date: Sat, 3 Dec 2016 23:34:48 +0530 Subject: tests/common/51: Skip validate test if pkg-config too old We originally skipped on Windows for the same reason, and now we need to do that for EPEL 7 and F23 which ship pkg-config 0.28 which doesn't have --validate. Closes #1129 --- test cases/common/51 pkgconfig-gen/meson.build | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) (limited to 'test cases/common') diff --git a/test cases/common/51 pkgconfig-gen/meson.build b/test cases/common/51 pkgconfig-gen/meson.build index 0933238b8..e1e41d944 100644 --- a/test cases/common/51 pkgconfig-gen/meson.build +++ b/test cases/common/51 pkgconfig-gen/meson.build @@ -19,11 +19,17 @@ pkgg.generate( ) pkgconfig = find_program('pkg-config', required: false) -if pkgconfig.found() and build_machine.system() != 'windows' - test('pkgconfig-validation', pkgconfig, - args: ['--validate', 'simple'], - env: ['PKG_CONFIG_PATH=' + meson.current_build_dir() + '/meson-private' ], - ) +if pkgconfig.found() + v = run_command(pkgconfig, '--version').stdout().strip() + if v.version_compare('>=0.29') + test('pkgconfig-validation', pkgconfig, + args: ['--validate', 'simple'], + env: ['PKG_CONFIG_PATH=' + meson.current_build_dir() + '/meson-private' ]) + else + message('pkg-config version \'' + v + '\' too old, skipping validate test') + endif +else + message('pkg-config not found, skipping validate test') endif # Test that name_prefix='' and name='libfoo' results in '-lfoo' -- cgit v1.2.3