libpkgconf/libpkgconf.h

@@ -298,11 +298,11 @@ PKGCONF_API bool pkgconf_default_error_handler(const char *msg, const pkgconf_cl
 #if defined(__GNUC__) || defined(__INTEL_COMPILER)
 #define PKGCONF_TRACE(client, ...) do { \
 		pkgconf_trace(client, __FILE__, __LINE__, __PRETTY_FUNCTION__, __VA_ARGS__); \
-	} while (0)
+	} while (0);
 #else
 #define PKGCONF_TRACE(client, ...) do { \
 		pkgconf_trace(client, __FILE__, __LINE__, __func__, __VA_ARGS__); \
-	} while (0)
+	} while (0);
 #endif
 #else
 #define PKGCONF_TRACE(client, ...)

meson.build

@@ -12,7 +12,6 @@ add_project_arguments(
   '-D_DEFAULT_SOURCE',
   cc.get_supported_arguments(
     '-Wimplicit-function-declaration',
-    '-Wmisleading-indentation',
   ),
   language : 'c',
 )
@@ -120,8 +119,9 @@ pkgconf_exe = executable('pkgconf',
 if get_option('tests')
   kyua_exe = find_program('kyua')
   atf_sh_exe = find_program('atf-sh')
-  kyuafile = configure_file(input : 'Kyuafile.in', output : 'Kyuafile', configuration : cdata)
+  test('kyua', kyua_exe, args : ['--config=none', 'test', '--kyuafile=' + join_paths(meson.current_build_dir(), 'Kyuafile'), '--build-root=' + meson.current_build_dir()])
-  test('kyua', kyua_exe, args : ['--config=none', 'test', '--kyuafile', kyuafile, '--build-root', meson.current_build_dir()])
+
+  configure_file(input : 'Kyuafile.in', output : 'Kyuafile', configuration : cdata)
   subdir('tests')
 endif
 

tests/meson.build

@@ -18,6 +18,6 @@ tests = [
 
 # yuck
 foreach test : tests
-  test_file = configure_file(input: test + '.sh', output: test, copy: true)
+  configure_file(input: test + '.sh', output: test, copy: true)
-  run_command('chmod', '755', test_file, check : true)
+  run_command('chmod', '755', join_paths(meson.current_build_dir(), 'tests', test))
 endforeach