diff options
Diffstat (limited to 'localedata/Makefile')
| -rw-r--r-- | localedata/Makefile | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/localedata/Makefile b/localedata/Makefile index 923916438a..11a6a79829 100644 --- a/localedata/Makefile +++ b/localedata/Makefile @@ -147,17 +147,18 @@ tests: $(objpfx)sort-test.out $(objpfx)tst-fmon.out $(objpfx)tst-locale.out \ $(objpfx)sort-test.out: sort-test.sh $(objpfx)collate-test $(objpfx)xfrm-test \ $(test-input-data) $(addprefix $(objpfx),$(CTYPE_FILES)) - $(SHELL) $< $(common-objpfx) '$(run-program-prefix)' $(test-input) \ + $(SHELL) $< $(common-objpfx) '$(test-program-prefix)' $(test-input) \ > $@ $(objpfx)tst-fmon.out: tst-fmon.sh $(objpfx)tst-fmon tst-fmon.data \ $(objpfx)sort-test.out \ $(addprefix $(objpfx),$(CTYPE_FILES)) - $(SHELL) $< $(common-objpfx) '$(run-program-prefix)' tst-fmon.data \ + $(SHELL) $< $(common-objpfx) '$(run-program-prefix)' \ + '$(test-program-prefix)' tst-fmon.data \ > $@ $(objpfx)tst-numeric.out: tst-numeric.sh $(objpfx)tst-numeric tst-numeric.data \ $(objpfx)sort-test.out \ $(addprefix $(objpfx),$(CTYPE_FILES)) - $(SHELL) $< $(common-objpfx) '$(run-program-prefix)' tst-numeric.data \ + $(SHELL) $< $(common-objpfx) '$(test-program-prefix)' tst-numeric.data \ > $@ $(objpfx)tst-locale.out: tst-locale.sh $(common-objpfx)locale/localedef \ $(ld-test-srcs) $(addprefix $(objpfx),$(CTYPE_FILES)) @@ -165,27 +166,27 @@ $(objpfx)tst-locale.out: tst-locale.sh $(common-objpfx)locale/localedef \ $(objpfx)tst-rpmatch.out: tst-rpmatch.sh $(objpfx)tst-rpmatch \ $(objpfx)tst-fmon.out \ $(addprefix $(objpfx),$(CTYPE_FILES)) - $(SHELL) $< $(common-objpfx) '$(built-program-cmd)' > $@ + $(SHELL) $< $(common-objpfx) '$(test-program-cmd)' > $@ $(objpfx)tst-trans.out: tst-trans.sh $(objpfx)tst-trans \ $(addprefix $(objpfx),$(CTYPE_FILES)) - $(SHELL) $< $(common-objpfx) '$(run-program-prefix)' + $(SHELL) $< $(common-objpfx) '$(run-program-prefix)' '$(test-program-prefix)' $(objpfx)tst-mbswcs.out: tst-mbswcs.sh $(objpfx)tst-mbswcs1 \ $(objpfx)tst-mbswcs2 $(objpfx)tst-mbswcs3 \ $(objpfx)tst-mbswcs4 $(objpfx)tst-mbswcs5 \ $(addprefix $(objpfx),$(CTYPE_FILES)) - $(SHELL) $< $(common-objpfx) '$(run-program-prefix)' + $(SHELL) $< $(common-objpfx) '$(test-program-prefix)' $(objpfx)tst-ctype.out: tst-ctype.sh $(objpfx)tst-ctype \ $(objpfx)sort-test.out \ $(addprefix $(objpfx),$(CTYPE_FILES)) - $(SHELL) $< $(common-objpfx) '$(built-program-cmd)' + $(SHELL) $< $(common-objpfx) '$(test-program-cmd)' $(objpfx)tst-wctype.out: tst-wctype.sh $(objpfx)tst-wctype \ $(objpfx)sort-test.out tst-wctype.input \ $(addprefix $(objpfx),$(CTYPE_FILES)) - $(SHELL) $< $(common-objpfx) '$(built-program-cmd)' + $(SHELL) $< $(common-objpfx) '$(test-program-cmd)' $(objpfx)tst-langinfo.out: tst-langinfo.sh $(objpfx)tst-langinfo \ $(objpfx)sort-test.out \ $(addprefix $(objpfx),$(CTYPE_FILES)) - $(SHELL) $< $(common-objpfx) '$(built-program-cmd)' + $(SHELL) $< $(common-objpfx) '$(test-program-cmd)' $(objpfx)tst-digits.out: $(objpfx)tst-locale.out $(objpfx)tst-mbswcs6.out: $(addprefix $(objpfx),$(CTYPE_FILES)) endif @@ -287,7 +288,7 @@ $(objpfx)mtrace-tst-leaks: $(objpfx)tst-leaks.out $(common-objpfx)malloc/mtrace $(objpfx)tst-leaks.mtrace > $@ bug-setlocale1-ENV = LOCPATH=$(common-objpfx)localedata -bug-setlocale1-ARGS = -- $(built-program-cmd) +bug-setlocale1-ARGS = -- $(test-program-cmd) bug-setlocale1-static-ENV = $(bug-setlocale1-ENV) bug-setlocale1-static-ARGS = $(bug-setlocale1-ARGS) tst-setlocale2-ENV = LOCPATH=$(common-objpfx)localedata |