This is the mail archive of the
libc-alpha@sourceware.org
mailing list for the glibc project.
[patch] Fix missing dependency of localedata tests on gconv-modules
- From: ppluzhnikov at google dot com (Paul Pluzhnikov)
- To: libc-alpha at sourceware dot org
- Cc: ppluzhnikov at google dot com
- Date: Tue, 16 Feb 2010 11:15:34 -0800 (PST)
- Subject: [patch] Fix missing dependency of localedata tests on gconv-modules
Greetings,
Running "make check" on a system which doesn't have suitable gconv-modules
installed, and with objdir != source directory, produces a bunch of failures
like this:
cat localedata/tst_mblen.out
mblen:de_DE.ISO-8859-1:1:1:2:F:the return value is different from an expected value
mblen:de_DE.ISO-8859-1:2:1:2:S:PASSED
mblen:de_DE.ISO-8859-1:3:1:2:S:PASSED
mblen:de_DE.ISO-8859-1:4:1:2:S:PASSED
mblen:de_DE.ISO-8859-1:5:1:2:S:PASSED
mblen:de_DE.ISO-8859-1:6:1:3:S:PASSED
mblen:en_US.ANSI_X3.4-1968:1:1:2:S:PASSED
mblen:en_US.ANSI_X3.4-1968:2:1:2:S:PASSED
mblen:en_US.ANSI_X3.4-1968:3:1:2:S:PASSED
mblen:en_US.ANSI_X3.4-1968:4:1:2:S:PASSED
mblen:en_US.ANSI_X3.4-1968:5:1:2:S:PASSED
mblen:en_US.ANSI_X3.4-1968:6:1:3:S:PASSED
mblen:ja_JP.EUC-JP:1:1:2:F:the return value is different from an expected value
mblen:ja_JP.EUC-JP:2:1:2:F:the return value is different from an expected value
mblen:ja_JP.EUC-JP:3:1:2:F:the return value is different from an expected value
mblen:ja_JP.EUC-JP:4:1:1:S:PASSED
mblen:ja_JP.EUC-JP:4:1:2:S:PASSED
mblen:ja_JP.EUC-JP:5:1:2:S:PASSED
mblen:ja_JP.EUC-JP:6:1:3:S:PASSED
But after running "make -k check", these failures disappear, because
$objdir/iconvdata/gconv-modules gets built (later) when
"make -C inconvdata check" executes.
Here is a possible fix.
[Google has blanket copyright assignment to FSF.]
Thanks,
--
Paul Pluzhnikov
2010-02-16 Paul Pluzhnikov <ppluzhnikov@google.com>
* loaledata/Makefile: Add missing gconv-modules dependency.
diff --git a/localedata/Makefile b/localedata/Makefile
index d364001..8f356ec 100644
--- a/localedata/Makefile
+++ b/localedata/Makefile
@@ -107,6 +107,8 @@ install-others := $(addprefix $(inst_i18ndir)/, \
$(addsuffix .gz, $(charmaps)) \
$(locales))
+tests: $(objdir)/iconvdata/gconv-modules
+
include ../Rules
# Install the charmap files in gzipped format.
@@ -298,3 +300,6 @@ tst-leaks-ENV = MALLOC_TRACE=$(objpfx)tst-leaks.mtrace \
LOCPATH=$(common-objpfx)localedata
$(objpfx)mtrace-tst-leaks: $(objpfx)tst-leaks.out
$(common-objpfx)malloc/mtrace $(objpfx)tst-leaks.mtrace > $@
+
+$(objdir)/iconvdata/gconv-modules:
+ $(MAKE) -C ../iconvdata subdir=iconvdata $@