diff options
| author | Joseph Myers <joseph@codesourcery.com> | 2012-10-19 23:30:43 +0000 |
|---|---|---|
| committer | Joseph Myers <joseph@codesourcery.com> | 2012-10-19 23:30:43 +0000 |
| commit | e40a0d2113bfeb5018409ed25e9711e6da7d994b (patch) | |
| tree | 49719c577bd5d3ba4da545a4a184a6a5326eee8d /grp | |
| parent | 728e272aec1b217bce32f1d75ecefb888e67b678 (diff) | |
Use $(run-program-prefix) in more shell script tests.
Diffstat (limited to 'grp')
| -rw-r--r-- | grp/Makefile | 3 | ||||
| -rw-r--r-- | grp/tst_fgetgrent.sh | 12 |
2 files changed, 6 insertions, 9 deletions
diff --git a/grp/Makefile b/grp/Makefile index 8cb99c1505..1988cbf10f 100644 --- a/grp/Makefile +++ b/grp/Makefile @@ -55,8 +55,7 @@ ifeq (no,$(cross-compiling)) ifeq (yes,$(build-shared)) tests: $(objpfx)tst_fgetgrent.out $(objpfx)tst_fgetgrent.out: tst_fgetgrent.sh $(objpfx)tst_fgetgrent - $(SHELL) $< $(common-objpfx) $(elf-objpfx) \ - $(rtld-installed-name) + $(SHELL) $< $(common-objpfx) '$(run-program-prefix)' endif endif diff --git a/grp/tst_fgetgrent.sh b/grp/tst_fgetgrent.sh index 7e69815ca1..0f21ee8e3e 100644 --- a/grp/tst_fgetgrent.sh +++ b/grp/tst_fgetgrent.sh @@ -20,24 +20,22 @@ set -e common_objpfx=$1; shift -elf_objpfx=$1; shift -rtld_installed_name=$1; shift +run_program_prefix=$1; shift testout=${common_objpfx}/grp/tst_fgetgrent.out -library_path=${common_objpfx} result=0 -${elf_objpfx}${rtld_installed_name} --library-path ${library_path} \ +${run_program_prefix} \ ${common_objpfx}grp/tst_fgetgrent 0 > ${testout} || result=1 -${elf_objpfx}${rtld_installed_name} --library-path ${library_path} \ +${run_program_prefix} \ ${common_objpfx}grp/tst_fgetgrent 1 >> ${testout} || result=1 -${elf_objpfx}${rtld_installed_name} --library-path ${library_path} \ +${run_program_prefix} \ ${common_objpfx}grp/tst_fgetgrent 2 >> ${testout} || result=1 -${elf_objpfx}${rtld_installed_name} --library-path ${library_path} \ +${run_program_prefix} \ ${common_objpfx}grp/tst_fgetgrent 3 >> ${testout} || result=1 exit $result |