aboutsummaryrefslogtreecommitdiff
path: root/stdio-common
diff options
context:
space:
mode:
authorH.J. Lu <hjl.tools@gmail.com>2013-01-11 07:14:18 -0800
committerH.J. Lu <hjl.tools@gmail.com>2013-01-11 07:14:18 -0800
commit740b3dbee8ef034019b240dc4838b39dfa0c01e2 (patch)
tree6b4caa77b597058c873bd5df2e0f7a859327c90a /stdio-common
parentc6fe55cf6089fc5cf1cea15fc7e1c9a8b90d9fda (diff)
downloadglibc-740b3dbee8ef034019b240dc4838b39dfa0c01e2.zip
glibc-740b3dbee8ef034019b240dc4838b39dfa0c01e2.tar.gz
glibc-740b3dbee8ef034019b240dc4838b39dfa0c01e2.tar.bz2
Add --enable-hardcoded-path-in-tests configure option
Diffstat (limited to 'stdio-common')
-rw-r--r--stdio-common/Makefile6
-rw-r--r--stdio-common/tst-printf.sh4
-rwxr-xr-xstdio-common/tst-unbputc.sh4
3 files changed, 7 insertions, 7 deletions
diff --git a/stdio-common/Makefile b/stdio-common/Makefile
index a0377df..f64a8ba 100644
--- a/stdio-common/Makefile
+++ b/stdio-common/Makefile
@@ -69,11 +69,11 @@ tests: do-tst-unbputc do-tst-printf
do-tst-unbputc: $(objpfx)tst-unbputc.out
$(objpfx)tst-unbputc.out: tst-unbputc.sh $(objpfx)tst-unbputc
- $(SHELL) $< $(common-objpfx) '$(run-program-prefix)'
+ $(SHELL) $< $(common-objpfx) '$(test-program-prefix)'
do-tst-printf: $(objpfx)tst-printf.out
$(objpfx)tst-printf.out: tst-printf.sh $(objpfx)tst-printf
- $(SHELL) $< $(common-objpfx) '$(run-program-prefix)'
+ $(SHELL) $< $(common-objpfx) '$(test-program-prefix)'
endif
CFLAGS-vfprintf.c = -Wno-uninitialized
@@ -127,7 +127,7 @@ tst-grouping-ENV = LOCPATH=$(common-objpfx)localedata
CPPFLAGS += $(libio-mtsafe)
$(objpfx)tst-setvbuf1.out: tst-setvbuf1.expect $(objpfx)tst-setvbuf1
- $(built-program-cmd) > $@ 2>&1
+ $(test-program-cmd) > $@ 2>&1
cmp tst-setvbuf1.expect $@
ifeq ($(build-shared),yes)
diff --git a/stdio-common/tst-printf.sh b/stdio-common/tst-printf.sh
index 6986c58..81e1e24 100644
--- a/stdio-common/tst-printf.sh
+++ b/stdio-common/tst-printf.sh
@@ -20,12 +20,12 @@
set -e
common_objpfx=$1; shift
-run_program_prefix=$1; shift
+test_program_prefix=$1; shift
status=0
LOCPATH=${common_objpfx}localedata GCONV_PATH=${common_objpfx}iconvdata \
-${run_program_prefix} \
+${test_program_prefix} \
${common_objpfx}stdio-common/tst-printf \
> ${common_objpfx}stdio-common/tst-printf.out || status=1
diff --git a/stdio-common/tst-unbputc.sh b/stdio-common/tst-unbputc.sh
index 07da54e..3ce8696 100755
--- a/stdio-common/tst-unbputc.sh
+++ b/stdio-common/tst-unbputc.sh
@@ -20,11 +20,11 @@
set -e
common_objpfx=$1; shift
-run_program_prefix=$1; shift
+test_program_prefix=$1; shift
status=0
-${run_program_prefix} \
+${test_program_prefix} \
${common_objpfx}stdio-common/tst-unbputc \
2> ${common_objpfx}stdio-common/tst-unbputc.out || status=1