mirror of
https://gitlab.freedesktop.org/NetworkManager/NetworkManager
synced 2024-10-07 00:31:11 +00:00
initrd/tests: drop special define for test directory
We got rid of all these redundant defines. All we need, is the base source directory, which we already define in config.h as NM_BUILD_SRCDIR. Use that.
This commit is contained in:
parent
a4ca3acb6b
commit
0bcd453e8c
18
Makefile.am
18
Makefile.am
|
@ -2691,12 +2691,13 @@ check_programs += src/core/initrd/tests/test-dt-reader
|
|||
|
||||
src_core_initrd_tests_test_dt_reader_CPPFLAGS = \
|
||||
-DNETWORKMANAGER_COMPILATION_TEST \
|
||||
-DTEST_INITRD_DIR=\"$(abs_srcdir)/src/core/initrd/tests\" \
|
||||
$(src_core_cppflags)
|
||||
$(src_core_cppflags) \
|
||||
$(NULL)
|
||||
|
||||
src_core_initrd_tests_test_dt_reader_LDFLAGS = \
|
||||
$(CODE_COVERAGE_LDFLAGS) \
|
||||
$(SANITIZER_EXEC_LDFLAGS)
|
||||
$(SANITIZER_EXEC_LDFLAGS) \
|
||||
$(NULL)
|
||||
|
||||
src_core_initrd_tests_test_dt_reader_LDADD = \
|
||||
src/core/initrd/libnmi-core.la \
|
||||
|
@ -2711,12 +2712,13 @@ check_programs += src/core/initrd/tests/test-ibft-reader
|
|||
|
||||
src_core_initrd_tests_test_ibft_reader_CPPFLAGS = \
|
||||
-DNETWORKMANAGER_COMPILATION_TEST \
|
||||
-DTEST_INITRD_DIR=\"$(abs_srcdir)/src/core/initrd/tests\" \
|
||||
$(src_core_cppflags)
|
||||
$(src_core_cppflags) \
|
||||
$(NULL)
|
||||
|
||||
src_core_initrd_tests_test_ibft_reader_LDFLAGS = \
|
||||
$(CODE_COVERAGE_LDFLAGS) \
|
||||
$(SANITIZER_EXEC_LDFLAGS)
|
||||
$(SANITIZER_EXEC_LDFLAGS) \
|
||||
$(NULL)
|
||||
|
||||
src_core_initrd_tests_test_ibft_reader_LDADD = \
|
||||
src/core/initrd/libnmi-core.la \
|
||||
|
@ -2947,8 +2949,8 @@ check_programs += src/core/initrd/tests/test-cmdline-reader
|
|||
|
||||
src_core_initrd_tests_test_cmdline_reader_CPPFLAGS = \
|
||||
-DNETWORKMANAGER_COMPILATION_TEST \
|
||||
-DTEST_INITRD_DIR=\"$(abs_srcdir)/src/core/initrd/tests\" \
|
||||
$(src_core_cppflags)
|
||||
$(src_core_cppflags) \
|
||||
$(NULL)
|
||||
|
||||
src_core_initrd_tests_test_cmdline_reader_LDFLAGS = \
|
||||
$(CODE_COVERAGE_LDFLAGS) \
|
||||
|
|
|
@ -1,7 +1,5 @@
|
|||
# SPDX-License-Identifier: LGPL-2.1-or-later
|
||||
|
||||
c_flags = test_c_flags + ['-DTEST_INITRD_DIR="@0@"'.format(meson.current_source_dir())]
|
||||
|
||||
test_units = [
|
||||
'test-dt-reader',
|
||||
'test-ibft-reader',
|
||||
|
@ -13,7 +11,7 @@ foreach test_unit : test_units
|
|||
test_unit,
|
||||
test_unit + '.c',
|
||||
dependencies: libNetworkManagerTest_dep,
|
||||
c_args: c_flags,
|
||||
c_args: test_c_flags,
|
||||
link_with: libnmi_core,
|
||||
)
|
||||
|
||||
|
|
|
@ -19,6 +19,8 @@
|
|||
|
||||
#include "nm-test-utils-core.h"
|
||||
|
||||
#define TEST_INITRD_DIR NM_BUILD_SRCDIR "/src/core/initrd/tests"
|
||||
|
||||
/*****************************************************************************/
|
||||
|
||||
#define _parse(ARGV, out_hostname, out_carrier_timeout_sec) \
|
||||
|
|
|
@ -19,6 +19,10 @@
|
|||
|
||||
#include "nm-test-utils-core.h"
|
||||
|
||||
#define TEST_INITRD_DIR NM_BUILD_SRCDIR "/src/core/initrd/tests"
|
||||
|
||||
/*****************************************************************************/
|
||||
|
||||
static void
|
||||
test_read_dt_ofw(void)
|
||||
{
|
||||
|
|
|
@ -19,6 +19,10 @@
|
|||
|
||||
#include "nm-test-utils-core.h"
|
||||
|
||||
#define TEST_INITRD_DIR NM_BUILD_SRCDIR "/src/core/initrd/tests"
|
||||
|
||||
/*****************************************************************************/
|
||||
|
||||
static NMConnection *
|
||||
read_connection(const char *sysfs_dir, const char *expected_mac, GError **error)
|
||||
{
|
||||
|
|
Loading…
Reference in a new issue