From 660643e498f6c084ac488f95c4392d02dde48a98 Mon Sep 17 00:00:00 2001 From: Emil Velikov Date: Thu, 6 Sep 2018 15:46:16 +0100 Subject: [PATCH] automake: set NM before running the tests Set/export the NM variable since it may not be set already. Fixes: 4f08bfe96da ("*-symbol-check: Don't hard-code nm executable") Cc: Heiko Becker Signed-off-by: Emil Velikov Reviewed-by: Eric Engestrom --- amdgpu/Makefile.am | 1 + etnaviv/Makefile.am | 1 + exynos/Makefile.am | 1 + freedreno/Makefile.am | 1 + intel/Makefile.am | 1 + libkms/Makefile.am | 1 + nouveau/Makefile.am | 1 + omap/Makefile.am | 1 + radeon/Makefile.am | 1 + tegra/Makefile.am | 1 + 10 files changed, 10 insertions(+) diff --git a/amdgpu/Makefile.am b/amdgpu/Makefile.am index 707082f0..ef8ab057 100644 --- a/amdgpu/Makefile.am +++ b/amdgpu/Makefile.am @@ -48,5 +48,6 @@ libdrm_amdgpuinclude_HEADERS = $(LIBDRM_AMDGPU_H_FILES) pkgconfigdir = @pkgconfigdir@ pkgconfig_DATA = libdrm_amdgpu.pc +AM_TESTS_ENVIRONMENT = NM='$(NM)' TESTS = amdgpu-symbol-check EXTRA_DIST = $(TESTS) diff --git a/etnaviv/Makefile.am b/etnaviv/Makefile.am index 9c2a3d7d..648e3c5b 100644 --- a/etnaviv/Makefile.am +++ b/etnaviv/Makefile.am @@ -23,5 +23,6 @@ libdrm_etnavivinclude_HEADERS = $(LIBDRM_ETNAVIV_H_FILES) pkgconfigdir = @pkgconfigdir@ pkgconfig_DATA = libdrm_etnaviv.pc +AM_TESTS_ENVIRONMENT = NM='$(NM)' TESTS = etnaviv-symbol-check EXTRA_DIST = $(TESTS) diff --git a/exynos/Makefile.am b/exynos/Makefile.am index 918b8d82..76b185d3 100644 --- a/exynos/Makefile.am +++ b/exynos/Makefile.am @@ -24,5 +24,6 @@ libdrm_exynosinclude_HEADERS = exynos_drmif.h pkgconfigdir = @pkgconfigdir@ pkgconfig_DATA = libdrm_exynos.pc +AM_TESTS_ENVIRONMENT = NM='$(NM)' TESTS = exynos-symbol-check EXTRA_DIST = $(TESTS) diff --git a/freedreno/Makefile.am b/freedreno/Makefile.am index 4cb542d3..37845035 100644 --- a/freedreno/Makefile.am +++ b/freedreno/Makefile.am @@ -28,5 +28,6 @@ libdrm_freedrenocommoninclude_HEADERS = $(LIBDRM_FREEDRENO_H_FILES) pkgconfigdir = @pkgconfigdir@ pkgconfig_DATA = libdrm_freedreno.pc +AM_TESTS_ENVIRONMENT = NM='$(NM)' TESTS = freedreno-symbol-check EXTRA_DIST = $(TESTS) diff --git a/intel/Makefile.am b/intel/Makefile.am index 5b1f2f56..bad44f5f 100644 --- a/intel/Makefile.am +++ b/intel/Makefile.am @@ -57,6 +57,7 @@ BATCHES = \ tests/gen7-2d-copy.batch \ tests/gen7-3d.batch +AM_TESTS_ENVIRONMENT = NM='$(NM)' TESTS = \ $(BATCHES:.batch=.batch.sh) \ intel-symbol-check diff --git a/libkms/Makefile.am b/libkms/Makefile.am index 5e08a380..ff4c1b2a 100644 --- a/libkms/Makefile.am +++ b/libkms/Makefile.am @@ -40,5 +40,6 @@ libkmsinclude_HEADERS = $(LIBKMS_H_FILES) pkgconfigdir = @pkgconfigdir@ pkgconfig_DATA = libkms.pc +AM_TESTS_ENVIRONMENT = NM='$(NM)' TESTS = kms-symbol-check EXTRA_DIST = $(TESTS) diff --git a/nouveau/Makefile.am b/nouveau/Makefile.am index 3c4d043b..5574fd8f 100644 --- a/nouveau/Makefile.am +++ b/nouveau/Makefile.am @@ -30,5 +30,6 @@ libdrm_nouveaunvifinclude_HEADERS = nvif/class.h \ pkgconfigdir = @pkgconfigdir@ pkgconfig_DATA = libdrm_nouveau.pc +AM_TESTS_ENVIRONMENT = NM='$(NM)' TESTS = nouveau-symbol-check EXTRA_DIST = $(TESTS) diff --git a/omap/Makefile.am b/omap/Makefile.am index 26978ae7..38a1007b 100644 --- a/omap/Makefile.am +++ b/omap/Makefile.am @@ -21,5 +21,6 @@ libdrm_omapinclude_HEADERS = omap_drmif.h pkgconfigdir = @pkgconfigdir@ pkgconfig_DATA = libdrm_omap.pc +AM_TESTS_ENVIRONMENT = NM='$(NM)' TESTS = omap-symbol-check EXTRA_DIST = $(TESTS) diff --git a/radeon/Makefile.am b/radeon/Makefile.am index c07b4922..e712a4ac 100644 --- a/radeon/Makefile.am +++ b/radeon/Makefile.am @@ -44,5 +44,6 @@ libdrm_radeoninclude_HEADERS = $(LIBDRM_RADEON_H_FILES) pkgconfigdir = @pkgconfigdir@ pkgconfig_DATA = libdrm_radeon.pc +AM_TESTS_ENVIRONMENT = NM='$(NM)' TESTS = radeon-symbol-check EXTRA_DIST = $(LIBDRM_RADEON_BOF_FILES) $(TESTS) diff --git a/tegra/Makefile.am b/tegra/Makefile.am index 08b5e7c4..53119970 100644 --- a/tegra/Makefile.am +++ b/tegra/Makefile.am @@ -22,5 +22,6 @@ libdrm_tegrainclude_HEADERS = tegra.h pkgconfigdir = @pkgconfigdir@ pkgconfig_DATA = libdrm_tegra.pc +AM_TESTS_ENVIRONMENT = NM='$(NM)' TESTS = tegra-symbol-check EXTRA_DIST = $(TESTS)