From: Emil Velikov emil.velikov@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@exherbo.org Cc: Eric Engestrom eric.engestrom@intel.com Signed-off-by: Emil Velikov emil.velikov@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)
From: Emil Velikov emil.velikov@collabora.com
It will make bugs like the one fixed with previous patch dead obvious.
Cc: Eric Engestrom eric.engestrom@intel.com Signed-off-by: Emil Velikov emil.velikov@collabora.com --- amdgpu/amdgpu-symbol-check | 2 ++ etnaviv/etnaviv-symbol-check | 2 ++ exynos/exynos-symbol-check | 2 ++ freedreno/freedreno-symbol-check | 2 ++ intel/intel-symbol-check | 2 ++ libkms/kms-symbol-check | 2 ++ nouveau/nouveau-symbol-check | 2 ++ omap/omap-symbol-check | 2 ++ radeon/radeon-symbol-check | 2 ++ tegra/tegra-symbol-check | 2 ++ 10 files changed, 20 insertions(+)
diff --git a/amdgpu/amdgpu-symbol-check b/amdgpu/amdgpu-symbol-check index 90b7a1d6..07477243 100755 --- a/amdgpu/amdgpu-symbol-check +++ b/amdgpu/amdgpu-symbol-check @@ -1,5 +1,7 @@ #!/bin/bash
+set -u + # The following symbols (past the first five) are taken from the public headers. # A list of the latter should be available Makefile.am/libdrm_amdgpuinclude_HEADERS
diff --git a/etnaviv/etnaviv-symbol-check b/etnaviv/etnaviv-symbol-check index bc509615..18910688 100755 --- a/etnaviv/etnaviv-symbol-check +++ b/etnaviv/etnaviv-symbol-check @@ -1,5 +1,7 @@ #!/bin/bash
+set -u + # The following symbols (past the first five) are taken from the public headers. # A list of the latter should be available Makefile.sources/LIBDRM_ETNAVIV_H_FILES
diff --git a/exynos/exynos-symbol-check b/exynos/exynos-symbol-check index e9f1b04d..49d611e6 100755 --- a/exynos/exynos-symbol-check +++ b/exynos/exynos-symbol-check @@ -1,5 +1,7 @@ #!/bin/bash
+set -u + # The following symbols (past the first five) are taken from the public headers. # A list of the latter should be available Makefile.am/libdrm_exynos*_HEADERS
diff --git a/freedreno/freedreno-symbol-check b/freedreno/freedreno-symbol-check index e732c995..6da9d667 100755 --- a/freedreno/freedreno-symbol-check +++ b/freedreno/freedreno-symbol-check @@ -1,5 +1,7 @@ #!/bin/bash
+set -u + # The following symbols (past the first five) are taken from the public headers. # A list of the latter should be available Makefile.sources/LIBDRM_FREEDRENO_H_FILES
diff --git a/intel/intel-symbol-check b/intel/intel-symbol-check index 4d30a4b1..de377bef 100755 --- a/intel/intel-symbol-check +++ b/intel/intel-symbol-check @@ -1,5 +1,7 @@ #!/bin/bash
+set -u + # The following symbols (past the first five) are taken from the public headers. # A list of the latter should be available Makefile.sources/LIBDRM_INTEL_H_FILES
diff --git a/libkms/kms-symbol-check b/libkms/kms-symbol-check index a5c2120d..30f444f7 100755 --- a/libkms/kms-symbol-check +++ b/libkms/kms-symbol-check @@ -1,5 +1,7 @@ #!/bin/bash
+set -u + # The following symbols (past the first five) are taken from the public headers. # A list of the latter should be available Makefile.sources/LIBKMS_H_FILES
diff --git a/nouveau/nouveau-symbol-check b/nouveau/nouveau-symbol-check index b3a24101..6296244c 100755 --- a/nouveau/nouveau-symbol-check +++ b/nouveau/nouveau-symbol-check @@ -1,5 +1,7 @@ #!/bin/bash
+set -u + # The following symbols (past the first five) are taken from the public headers. # A list of the latter should be available Makefile.sources/LIBDRM_NOUVEAU_H_FILES
diff --git a/omap/omap-symbol-check b/omap/omap-symbol-check index 0fb4a0f2..16da3c40 100755 --- a/omap/omap-symbol-check +++ b/omap/omap-symbol-check @@ -1,5 +1,7 @@ #!/bin/bash
+set -u + # The following symbols (past the first five) are taken from the public headers. # A list of the latter should be available Makefile.am/libdrm_omap*HEADERS
diff --git a/radeon/radeon-symbol-check b/radeon/radeon-symbol-check index 7d79d901..da605bb8 100755 --- a/radeon/radeon-symbol-check +++ b/radeon/radeon-symbol-check @@ -1,5 +1,7 @@ #!/bin/bash
+set -u + # The following symbols (past the first five) are taken from the public headers. # A list of the latter should be available Makefile.sources/LIBDRM_RADEON_H_FILES
diff --git a/tegra/tegra-symbol-check b/tegra/tegra-symbol-check index 509b678c..8539b95b 100755 --- a/tegra/tegra-symbol-check +++ b/tegra/tegra-symbol-check @@ -1,5 +1,7 @@ #!/bin/bash
+set -u + # The following symbols (past the first nine) are taken from tegra.h.
FUNCS=$($NM -D --format=bsd --defined-only ${1-.libs/libdrm_tegra.so} | awk '{print $3}'| while read func; do
On Thursday, 2018-09-06 15:53:33 +0100, Emil Velikov wrote:
From: Emil Velikov emil.velikov@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@exherbo.org Cc: Eric Engestrom eric.engestrom@intel.com Signed-off-by: Emil Velikov emil.velikov@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)'
I thought only double-quotes worked for this? If this works, series is: Reviewed-by: Eric Engestrom eric.engestrom@intel.com
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
dri-devel@lists.freedesktop.org