tests/ctests: Build ctests separately

At present the ctests are not properly linked with the built code,
this causes issues when there are interdependencies between the
modules.

The meson build system does not appear to have support for
internal build order or dependncies, so the only way I have found
to make this work is to break out the build of the ctests as a
separate project.

This is required to avoid undefined symbols in the test code for
the next patch in this series.

Signed-off-by: Frode Nordahl <[email protected]>

meson.build

@@ -71,7 +71,12 @@ test_env = [
 ]
 
 if get_option('unit_testing')
-  subdir('tests/ctests')
+    test('ctests',
+         find_program('tests/ctests/run.sh'),
+         workdir: join_paths(meson.current_source_dir(), 'tests/ctests'),
+         args: [join_paths(meson.current_build_dir(), '_ctestsbuild'),
+                '-Dparent_current_source_dir=' + meson.current_source_dir(),
+                '-Dparent_current_build_dir=' + meson.current_build_dir()])
 endif
 
 #FIXME: exclude doc/env/

tests/ctests/build.sh

@@ -0,0 +1,9 @@
+#!/bin/sh
+
+BUILDDIR="$1"; shift
+meson setup ${BUILDDIR} $*
+meson compile -C ${BUILDDIR} --verbose
+
+if [ "$(basename $0)" = "run.sh" ]; then
+    meson test -C ${BUILDDIR}
+fi

tests/ctests/meson.build

@@ -1,3 +1,10 @@
+project('ctests', 'c')
+
+add_project_arguments(
+    '-DSBINDIR="' + join_paths(get_option('prefix'), get_option('sbindir')) + '"',
+    '-D_GNU_SOURCE',
+    language: 'c')
+
 tests = {
   'test_netplan_parser': false,
   'test_netplan_state': false,
@@ -10,15 +17,25 @@ tests = {
   'test_netplan_openvswitch': false,
 }
 
+glib = dependency('glib-2.0')
+gio  = dependency('gio-2.0')
+yaml = dependency('yaml-0.1')
+uuid = dependency('uuid')
 cmocka = dependency('cmocka', required: true)
+netplan = meson.get_compiler('c').find_library(
+    'netplan',
+    dirs: [join_paths(get_option('parent_current_build_dir'), 'src')])
 
 foreach name, should_fail: tests
   exe = executable(name,
     '@[email protected]'.format(name),
-    include_directories: [inc, inc_internal],
-    dependencies: [cmocka, glib, gio, yaml, uuid],
+    include_directories: [
+      join_paths(get_option('parent_current_source_dir'), 'include'),
+      join_paths(get_option('parent_current_source_dir'), 'src'),
+    ],
+    dependencies: [cmocka, glib, gio, yaml, uuid, netplan],
     c_args: [
-      '-DFIXTURESDIR="' + meson.project_source_root() + '/tests/ctests/fixtures"',
+      '-DFIXTURESDIR="' + meson.project_source_root() + '/fixtures"',
       '-Wno-deprecated-declarations',
       '-D_GNU_SOURCE',
       ],

tests/ctests/meson_options.txt

@@ -0,0 +1,2 @@
+option('parent_current_source_dir', type: 'string', value: '')
+option('parent_current_build_dir', type: 'string', value: '')

tests/ctests/run.sh

@@ -0,0 +1 @@
+build.sh

tools/run_asan.sh

@@ -10,6 +10,13 @@ CC=gcc
 meson setup ${BUILDDIR} -Db_sanitize=address,undefined
 meson compile -C ${BUILDDIR} --verbose
 
+tests/ctests/build.sh \
+    ${BUILDDIR}/_ctestsbuild \
+    tests/ctests \
+    -Dparent_current_source_dir=$(realpath .) \
+    -Dparent_current_build_dir=$(realpath ${BUILDDIR}) \
+    -Db_sanitize=address,undefined
+
 meson setup ${CLEANBUILDDIR}
 meson compile -C ${CLEANBUILDDIR} --verbose
 
@@ -18,7 +25,7 @@ ${CC} tools/keyfile_to_yaml.c -o tools/keyfile_to_yaml \
     -Iinclude -L${BUILDDIR}/src \
     -fsanitize=address,undefined -g
 
-TESTS=$(find ${BUILDDIR}/tests/ctests/ -executable -type f)
+TESTS=$(find ${BUILDDIR}/_ctestsbuild/ -executable -type f)
 for test in ${TESTS}
 do
     ./${test}