From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sun, 30 May 2010 22:13:57 +0000 (+0200)
Subject: glibc: Enable testsuite (on regular build).
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=34c789f0d9f24bb9bed4ea25673200588081494a;p=ipfire-3.x.git

glibc: Enable testsuite (on regular build).
---

diff --git a/pkgs/core/glibc/glibc.nm b/pkgs/core/glibc/glibc.nm
index b365456b6..f1380d854 100644
--- a/pkgs/core/glibc/glibc.nm
+++ b/pkgs/core/glibc/glibc.nm
@@ -203,11 +203,9 @@ define STAGE_BUILD
 		CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)"
 endef
 
-#define STAGE_TEST
-#	cd $(DIR_SRC)/glibc-build && cp -vf ../$(THISAPP)/iconvdata/gconv-modules iconvdata
-#	cd $(DIR_SRC)/glibc-build && make -k check 2>&1 | tee glibc-check-log
-#	cd $(DIR_SRC)/glibc-build && grep Error glibc-check-log
-#endef
+define STAGE_TEST
+	cd $(DIR_SRC)/glibc-build && make check
+endef
 
 define STAGE_INSTALL
 	cd $(DIR_SRC)/glibc-build && make install install_root=$(BUILDROOT)
diff --git a/pkgs/toolchain/glibc/glibc.nm b/pkgs/toolchain/glibc/glibc.nm
index 737e0f9fd..495d1fdac 100644
--- a/pkgs/toolchain/glibc/glibc.nm
+++ b/pkgs/toolchain/glibc/glibc.nm
@@ -22,6 +22,8 @@ define STAGE_BUILD
 	cd $(DIR_SRC)/glibc-build && make PARALLELMFLAGS=$(PARALLELISMFLAGS)
 endef
 
+STAGE_TEST = # No test here.
+
 define STAGE_INSTALL
 	-mkdir -v $(TOOLS_DIR)/etc
 	touch $(TOOLS_DIR)/etc/ld.so.conf