glibc: Enable testsuite (on regular build).

diff --git a/pkgs/core/glibc/glibc.nm b/pkgs/core/glibc/glibc.nm
index b365456b6f315b5d1798ed28775eca9b225b47e8..f1380d85437a2622dbe1511b90cf7f20f9b46992 100644 (file)
--- 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 737e0f9fd6203f574a6dd95bcee0674f0f2cd2eb..495d1fdacace2c4c378ab0af3e55c1ce9defe52c 100644 (file)
--- 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