about summary refs log tree commit diff
diff options
context:
space:
mode:
authorMao Han <han_mao@c-sky.com>2019-07-10 14:09:51 +0800
committerMao Han <han_mao@c-sky.com>2019-07-10 14:24:15 +0800
commit7901d4ee7ba91c963a9a7c9365267552edad32f3 (patch)
treee5e6520cfb497e00c506ab592074d70b0b7d9041
parentb5232c9f9e6048b8f780d3cbfadbc8e59bb90ce4 (diff)
downloadglibc-7901d4ee7ba91c963a9a7c9365267552edad32f3.tar.gz
glibc-7901d4ee7ba91c963a9a7c9365267552edad32f3.tar.xz
glibc-7901d4ee7ba91c963a9a7c9365267552edad32f3.zip
locale/tst-locale-locpath: Fix arguments passing
The arguments passed by Makefile are missing match with the arguments
taken by locale/tst-locale-locpath.sh. Without this patch
cross-test-ssh.sh will be called twice in a single command while
doing the make check test wish ssh test wrapper.

	* locale/Makefile: Fix tst-locale-locpath arguments passing.
-rw-r--r--ChangeLog4
-rw-r--r--locale/Makefile2
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 158337ab9c..632e1804d8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2019-07-10  Mao Han  <han_mao@c-sky.com>
+
+	* locale/Makefile: Fix tst-locale-locpath arguments passing.
+
 2019-07-09  Paul A. Clarke  <pc@us.ibm.com>
     
 	* sysdeps/powerpc/fpu/fenv_libc.h (_FPU_GET_RC): Protect use of
diff --git a/locale/Makefile b/locale/Makefile
index 0ad99ecabf..d78cf9b83a 100644
--- a/locale/Makefile
+++ b/locale/Makefile
@@ -113,5 +113,5 @@ lib := locale-programs
 include $(patsubst %,$(..)libof-iterator.mk,$(cpp-srcs-left))
 
 $(objpfx)tst-locale-locpath.out : tst-locale-locpath.sh $(objpfx)locale
-	$(SHELL) $< '$(common-objpfx)' '$(test-wrapper)' '$(test-wrapper-env)' > $@; \
+	$(SHELL) $< '$(common-objpfx)' '$(test-wrapper-env)' '$(run-program-env)' > $@; \
 	$(evaluate-test)