about summary refs log tree commit diff
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>2004-12-19 23:44:07 +0000
committerRoland McGrath <roland@gnu.org>2004-12-19 23:44:07 +0000
commitff06ca8d203955505886309f5da257a64f5407e4 (patch)
treea03d69a62fd533c1c068f3601b94625eefd3f4ce
parent6a361b2e92b4a8de5df3f9c3b8dae8a2b73f60b2 (diff)
downloadglibc-cvs/fedora-glibc-20041219T2331.tar.gz
glibc-cvs/fedora-glibc-20041219T2331.tar.xz
glibc-cvs/fedora-glibc-20041219T2331.zip
* iconv/Makefile (test-iconvconfig): New target. cvs/fedora-glibc-20041219T2331
	[$(cross-compiling) != yes] (xtests): Depend on it.
-rw-r--r--ChangeLog3
-rw-r--r--iconv/Makefile12
2 files changed, 15 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 839475ddd7..d15688c3ae 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2004-12-19  Roland McGrath  <roland@redhat.com>
 
+	* iconv/Makefile (test-iconvconfig): New target.
+	[$(cross-compiling) != yes] (xtests): Depend on it.
+
 	* iconv/iconvconfig.c (nostdlib, output_file, output_file_len):
 	New variables.
 	(options, parse_opt, main): Take new options --nostdlib and
diff --git a/iconv/Makefile b/iconv/Makefile
index fe0c453e7b..40c7cbcdd3 100644
--- a/iconv/Makefile
+++ b/iconv/Makefile
@@ -78,3 +78,15 @@ $(inst_bindir)/iconv: $(objpfx)iconv_prog $(+force)
 
 $(objpfx)iconv_prog: $(iconv_prog-modules:%=$(objpfx)%.o)
 $(objpfx)iconvconfig: $(iconvconfig-modules:%=$(objpfx)%.o)
+
+ifneq ($(cross-compiling),yes)
+xtests: test-iconvconfig
+endif
+
+.PHONY: test-iconvconfig
+test-iconvconfig: /dev/null $(objpfx)iconvconfig
+	tmp=$(objpfx)gconv-modules.cache.$$$$; \
+	rm -f $$tmp; \
+	$(make-test-out) --output=$$tmp --nostdlib $(inst_gconvdir) && \
+	cmp $$tmp $(inst_gconvdir)/gconv-modules.cache && \
+	rm -f $$tmp