diff options
author | Gabriel F. T. Gomes <gftg@linux.vnet.ibm.com> | 2016-05-25 10:04:06 -0300 |
---|---|---|
committer | Gabriel F. T. Gomes <gftg@linux.vnet.ibm.com> | 2016-05-25 10:04:06 -0300 |
commit | 2feb372c585eb77141adbff24d4958e5a5e6678a (patch) | |
tree | 79416b255a6e61e6fdbc913da3be86d87a8a25ff /misc/Makefile | |
parent | c69c361ca6bf95f8c665884ee863168a321d472a (diff) | |
parent | 916ef0f69613613e11123657bff127bd26104630 (diff) | |
download | glibc-ibm/2.20/master.tar.gz glibc-ibm/2.20/master.tar.xz glibc-ibm/2.20/master.zip |
Merge release/2.20/master into ibm/2.20/master ibm/2.20/master
Conflicts: NEWS
Diffstat (limited to 'misc/Makefile')
-rw-r--r-- | misc/Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/misc/Makefile b/misc/Makefile index edac24cfc2..ec5f9616f6 100644 --- a/misc/Makefile +++ b/misc/Makefile @@ -76,7 +76,8 @@ install-lib := libg.a gpl2lgpl := error.c error.h tests := tst-dirname tst-tsearch tst-fdset tst-efgcvt tst-mntent tst-hsearch \ - tst-error1 tst-pselect tst-insremque tst-mntent2 bug-hsearch1 + tst-error1 tst-pselect tst-insremque tst-mntent2 bug-hsearch1 \ + bug18240 ifeq ($(run-built-tests),yes) tests-special += $(objpfx)tst-error1-mem.out endif |