Build programs in $(others-noinstall) like tests

Programs in $(others-noinstall) are internal to glibc build and they
aren't installed.  They should be treated like programs in $(others),
but linked like tests so that --enable-hardcoded-path-in-tests also
applies to them.

Also replace run-via-rtld-prefix with test-via-rtld-prefix when running
container tests.

Signed-off-by: H.J. Lu <hjl.tools@gmail.com>
Reviewed-by: DJ Delorie <dj@redhat.com>

diff --git a/Rules b/Rules
index 44c041c4912f0e8f44fa50bdf49e9d0acc4e0004..7f6d0636737069d026da25bf3a00149f8b256ec6 100644 (file)
--- a/Rules
+++ b/Rules
@@ -195,9 +195,10 @@ xtests:
          > $(objpfx)subdir-xtests.sum
 
 ifeq ($(build-programs),yes)
-binaries-all-notests = $(others) $(sysdep-others)
+binaries-all-notests = $(filter-out $(others-noinstall), \
+                        $(others) $(sysdep-others))
 binaries-all-tests = $(tests) $(tests-internal) $(xtests) $(test-srcs) \
-                    $(tests-container)
+                    $(tests-container) $(others-noinstall)
 binaries-all = $(binaries-all-notests) $(binaries-all-tests)
 binaries-static-notests = $(others-static)
 binaries-static-tests = $(tests-static) $(xtests-static)
@@ -385,7 +386,7 @@ $(objpfx)%.out: /dev/null $(objpfx)%        # Make it 2nd arg for canned sequence.
 # and pid namespaces) in which to run, should be added to
 # tests-container.
 $(tests-container:%=$(objpfx)%.out): $(objpfx)%.out : $(if $(wildcard $(objpfx)%.files),$(objpfx)%.files,/dev/null) $(objpfx)%
-       $(test-wrapper-env) $(run-program-env) $(run-via-rtld-prefix) \
+       $(test-wrapper-env) $(run-program-env) $(test-via-rtld-prefix) \
          $(common-objpfx)support/test-container env $(run-program-env) $($*-ENV) \
          $(host-test-program-cmd) $($*-ARGS) > $@; \
        $(evaluate-test)