tests: Quote make variables in TESTS_ENVIRONMENT

Commit eb922a1b8f3a ("tests: use ${CC} instead of 'gcc' in tests")
exports ${CC} into the test environment, but doesn't quote the
value for the assignment. That doesn't work properly if the value
contains whitespace. In a multilib/biarch environment however, it's
common to set CC="gcc -m32" or similar. That causes tests to print
error messages: "/bin/sh: line 2: -m32: command not found".

Fix that by adding quotes around all make variables (not just $CC)
used in setting up TESTS_ENVIRONMENT.

Signed-off-by: Alexander Miller <alex.miller@gmx.de>

diff --git a/tests/ChangeLog b/tests/ChangeLog
index e22fa455fe1571d8c0eb2bc9ab0717eb43472aed..bc94512e2d41508399fbb97ee967f1760479f560 100644 (file)
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -1,3 +1,8 @@
+2021-02-07  Alexander Miller  <alex.miller@gmx.de>
+
+       * Makefile.am (TESTS_ENVIRONMENT): Quote variables.
+       (valgrind_cmd): Unquote variable.
+
 2021-02-08  Érico Nogueira  <ericonr@disroot.org>
 
        * run-debuginfod-find.sh: Check for cpio availability.

diff --git a/tests/Makefile.am b/tests/Makefile.am
index c145720cbc252aa565d8c2db8cfc47bbf5615fe1..852269a34698b2457b1ab2dd104165307c47059c 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -511,36 +511,37 @@ EXTRA_DIST = run-arextract.sh run-arsymtest.sh run-ar.sh \
 
 
 if USE_VALGRIND
-valgrind_cmd='valgrind -q --leak-check=full --error-exitcode=1'
+valgrind_cmd=valgrind -q --leak-check=full --error-exitcode=1
 endif
 
 
-installed_TESTS_ENVIRONMENT = libdir=$(DESTDIR)$(libdir); \
-                             bindir=$(DESTDIR)$(bindir); \
+installed_TESTS_ENVIRONMENT = libdir='$(DESTDIR)$(libdir)'; \
+                             bindir='$(DESTDIR)$(bindir)'; \
                              LC_ALL=C; LANG=C; \
-                             VALGRIND_CMD=$(valgrind_cmd); \
-                             abs_srcdir=$(abs_srcdir); \
-                             abs_builddir=$(abs_builddir); \
-                             abs_top_builddir=$(abs_top_builddir); \
+                             VALGRIND_CMD='$(valgrind_cmd)'; \
+                             abs_srcdir='$(abs_srcdir)'; \
+                             abs_builddir='$(abs_builddir)'; \
+                             abs_top_builddir='$(abs_top_builddir)'; \
                              export abs_srcdir; export abs_builddir; \
                              export abs_top_builddir; \
                              export libdir; export bindir; \
                              export LC_ALL; export LANG; export VALGRIND_CMD; \
                              unset DEBUGINFOD_URLS; \
-                             NM=$(NM); export NM; \
-                             CC=$(CC); export CC;
+                             NM='$(NM)'; export NM; \
+                             CC='$(CC)'; export CC;
 installed_LOG_COMPILER = $(abs_srcdir)/test-wrapper.sh \
                         installed $(tests_rpath) \
                         '$(program_transform_name)'
-TESTS_ENVIRONMENT = LC_ALL=C; LANG=C; VALGRIND_CMD=$(valgrind_cmd); \
-                   abs_srcdir=$(abs_srcdir);  abs_builddir=$(abs_builddir); \
-                   abs_top_builddir=$(abs_top_builddir); \
+TESTS_ENVIRONMENT = LC_ALL=C; LANG=C; VALGRIND_CMD='$(valgrind_cmd)'; \
+                   abs_srcdir='$(abs_srcdir)'; \
+                   abs_builddir='$(abs_builddir)'; \
+                   abs_top_builddir='$(abs_top_builddir)'; \
                    export abs_srcdir; export abs_builddir; \
                    export abs_top_builddir; \
                    export LC_ALL; export LANG; export VALGRIND_CMD; \
                    unset DEBUGINFOD_URLS; \
-                   NM=$(NM); export NM; \
-                   CC=$(CC); export CC;
+                   NM='$(NM)'; export NM; \
+                   CC='$(CC)'; export CC;
 LOG_COMPILER = $(abs_srcdir)/test-wrapper.sh \
               $(abs_top_builddir)/libdw:$(abs_top_builddir)/backends:$(abs_top_builddir)/libelf:$(abs_top_builddir)/libasm:$(abs_top_builddir)/debuginfod