D31815.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D31815.diff
View Options

	diff --git a/tools/test/iconv/Makefile b/tools/test/iconv/Makefile
	--- a/tools/test/iconv/Makefile
	+++ b/tools/test/iconv/Makefile
	@@ -29,10 +29,10 @@
	# MACHEBREW
	.endif

	-GEN_FWD?= ${.CURDIR}/tablegen/tablegen -t
	-GEN_REV?= ${.CURDIR}/tablegen/tablegen -tr
	-REF_FWD?= ${.CURDIR}/refgen/refgen -t
	-REF_REV?= ${.CURDIR}/refgen/refgen -tr
	+GEN_FWD?= ${.OBJDIR}/tablegen/tablegen -t
	+GEN_REV?= ${.OBJDIR}/tablegen/tablegen -tr
	+REF_FWD?= ${.OBJDIR}/refgen/refgen -t
	+REF_REV?= ${.OBJDIR}/refgen/refgen -tr
	CMP?= ${.CURDIR}/tablegen/cmp.sh

	make-ref: refgen
	@@ -49,10 +49,10 @@
	.for enc in ${ENCODING}
	@echo "Checking ${enc} --> UTF-32 ..."
	-@${GEN_FWD} ${enc} >output/${enc}
	- @${CMP} ref/${enc} output/${enc}
	+ @${CMP} ${.CURDIR}/ref/${enc} ${.OBJDIR}/output/${enc}
	@echo "Checking UTF-32 --> ${enc} ..."
	-@${GEN_REV} ${enc} >output/${enc}-rev
	- @${CMP} ref/${enc}-rev output/${enc}-rev
	+ @${CMP} ${.CURDIR}/ref/${enc}-rev ${.OBJDIR}/output/${enc}-rev
	.endfor

	perftest: refgen tablegen
	@@ -70,10 +70,10 @@
	.endfor

	posixtest: posix
	- @${.CURDIR}/posix/posix
	+ @${.OBJDIR}/posix/posix

	gnutest: gnu
	- @${.CURDIR}/gnu/gnu
	+ @${.OBJDIR}/gnu/gnu

	test-everything: check perftest posixtest gnutest