[PATCH libdrm 1/2] automake: set NM before running the tests

Emil Velikov emil.l.velikov at gmail.com
Thu Sep 6 14:53:33 UTC 2018


From: Emil Velikov <emil.velikov at collabora.com>

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 <heirecka at exherbo.org>
Cc: Eric Engestrom <eric.engestrom at intel.com>
Signed-off-by: Emil Velikov <emil.velikov at collabora.com>
---
 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 a1b0d05c..1a8538f5 100644
--- a/amdgpu/Makefile.am
+++ b/amdgpu/Makefile.am
@@ -47,5 +47,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 be96ba86..38ed1717 100644
--- a/etnaviv/Makefile.am
+++ b/etnaviv/Makefile.am
@@ -22,5 +22,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 f99f8981..c1dda663 100644
--- a/exynos/Makefile.am
+++ b/exynos/Makefile.am
@@ -23,5 +23,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 cbb0d031..f4f0bafe 100644
--- a/freedreno/Makefile.am
+++ b/freedreno/Makefile.am
@@ -27,5 +27,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 c52e8c08..acedb795 100644
--- a/intel/Makefile.am
+++ b/intel/Makefile.am
@@ -56,6 +56,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 461fc35b..cd273fa7 100644
--- a/libkms/Makefile.am
+++ b/libkms/Makefile.am
@@ -39,5 +39,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 344a8445..9f61491b 100644
--- a/nouveau/Makefile.am
+++ b/nouveau/Makefile.am
@@ -29,5 +29,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 599bb9de..56257c89 100644
--- a/omap/Makefile.am
+++ b/omap/Makefile.am
@@ -20,5 +20,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 e2415314..0f5f94a1 100644
--- a/radeon/Makefile.am
+++ b/radeon/Makefile.am
@@ -43,5 +43,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 fb40be55..92b2ce2a 100644
--- a/tegra/Makefile.am
+++ b/tegra/Makefile.am
@@ -21,5 +21,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)
-- 
2.18.0



More information about the dri-devel mailing list