Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0fb5c8df authored by Dan Williams's avatar Dan Williams
Browse files

tools/testing/nvdimm: force nfit_test to depend on instrumented modules 



The libnvdimm unit tests will fail when they are run against the
production / in-tree version of libnvdimm.ko or nfit.ko due to
symbols not being mocked per nfit_test's expectation. For example,
nfit_test expects acpi_evaluate_dsm() to be replaced by
__wrap_acpi_evaluate_dsm() to test how acpi_nfit_ctl() responds to
different stimuli.

Create a test-only symbol name that nfit_test links against to cause
module load failures when the wrong module is present.

For example, with this change, attempts to use the wrong module will
report:

    nfit_test: Unknown symbol libnvdimm_test (err 0)

Reported-by: default avatarDave Jiang <dave.jiang@intel.com>
Reported-by: default avatarVishal Verma <vishal.l.verma@intel.com>
Signed-off-by: default avatarDan Williams <dan.j.williams@intel.com>
parent 674d8bde

tools/testing/nvdimm/Kbuild

+4 −0
Original line number Diff line number Diff line
@@ -37,10 +37,12 @@ obj-$(CONFIG_DEV_DAX_PMEM) += dax_pmem.o 


nfit-y := $(ACPI_SRC)/core.o

nfit-$(CONFIG_X86_MCE) += $(ACPI_SRC)/mce.o

nfit-y += acpi_nfit_test.o

nfit-y += config_check.o



nd_pmem-y := $(NVDIMM_SRC)/pmem.o

nd_pmem-y += pmem-dax.o

nd_pmem-y += pmem_test.o

nd_pmem-y += config_check.o



nd_btt-y := $(NVDIMM_SRC)/btt.o
@@ -57,6 +59,7 @@ dax-y += config_check.o 


device_dax-y := $(DAX_SRC)/device.o

device_dax-y += dax-dev.o

device_dax-y += device_dax_test.o

device_dax-y += config_check.o



dax_pmem-y := $(DAX_SRC)/pmem.o
@@ -75,6 +78,7 @@ libnvdimm-$(CONFIG_ND_CLAIM) += $(NVDIMM_SRC)/claim.o 
libnvdimm-$(CONFIG_BTT) += $(NVDIMM_SRC)/btt_devs.o

libnvdimm-$(CONFIG_NVDIMM_PFN) += $(NVDIMM_SRC)/pfn_devs.o

libnvdimm-$(CONFIG_NVDIMM_DAX) += $(NVDIMM_SRC)/dax_devs.o

libnvdimm-y += libnvdimm_test.o

libnvdimm-y += config_check.o



obj-m += test/

tools/testing/nvdimm/acpi_nfit_test.c

0 → 100644
+8 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

// Copyright(c) 2018 Intel Corporation. All rights reserved.



#include <linux/module.h>

#include <linux/printk.h>

#include "watermark.h"



nfit_test_watermark(acpi_nfit);

tools/testing/nvdimm/device_dax_test.c

0 → 100644
+8 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

// Copyright(c) 2018 Intel Corporation. All rights reserved.



#include <linux/module.h>

#include <linux/printk.h>

#include "watermark.h"



nfit_test_watermark(device_dax);

tools/testing/nvdimm/libnvdimm_test.c

0 → 100644
+8 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

// Copyright(c) 2018 Intel Corporation. All rights reserved.



#include <linux/module.h>

#include <linux/printk.h>

#include "watermark.h"



nfit_test_watermark(libnvdimm);

tools/testing/nvdimm/pmem_test.c

0 → 100644
+8 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

// Copyright(c) 2018 Intel Corporation. All rights reserved.



#include <linux/module.h>

#include <linux/printk.h>

#include "watermark.h"



nfit_test_watermark(pmem);