about summary refs log tree commit diff
diff options
context:
space:
mode:
authorRoland McGrath <roland@hack.frob.com>2015-10-08 14:50:22 -0700
committerRoland McGrath <roland@hack.frob.com>2015-10-08 14:50:22 -0700
commit240634ec353e3bf20e669201e6dca885ae35f42d (patch)
tree301306e089cddad901fea1f912af27bd6efb9e99
parent02018629a1397d03eccceacaf2ee1c50e3c4001c (diff)
downloadglibc-240634ec353e3bf20e669201e6dca885ae35f42d.tar.gz
glibc-240634ec353e3bf20e669201e6dca885ae35f42d.tar.xz
glibc-240634ec353e3bf20e669201e6dca885ae35f42d.zip
BZ#18872: Don't conditionalize build rules for test program.
-rw-r--r--ChangeLog8
-rw-r--r--stdio-common/Makefile2
2 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index df07ebfabf..8a4e803a29 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2015-10-08  Roland McGrath  <roland@hack.frob.com>
+
+	[BZ #18872]
+	* stdio-common/Makefile ($(objpfx)tst-unbputc.out):
+	Move out from under [$(run-built-tests) = yes] conditional.
+	($(objpfx)tst-printf.out, $(objpfx)tst-printf-bz18872.c): Likewise.
+	($(objpfx)tst-printf-bz18872-mem.out): Likewise.
+
 2015-10-08  Carlos O'Donell  <carlos@redhat.com>
 
 	[BZ #18589]
diff --git a/stdio-common/Makefile b/stdio-common/Makefile
index 40f5cdf267..df4122d206 100644
--- a/stdio-common/Makefile
+++ b/stdio-common/Makefile
@@ -74,7 +74,6 @@ include ../Rules
 
 tst-printf-bz18872-ENV = MALLOC_TRACE=$(objpfx)tst-printf-bz18872.mtrace
 
-ifeq ($(run-built-tests),yes)
 $(objpfx)tst-unbputc.out: tst-unbputc.sh $(objpfx)tst-unbputc
 	$(SHELL) $< $(common-objpfx) '$(test-program-prefix)'; \
 	$(evaluate-test)
@@ -91,7 +90,6 @@ $(objpfx)tst-printf-bz18872.c: tst-printf-bz18872.sh
 $(objpfx)tst-printf-bz18872-mem.out: $(objpfx)tst-printf-bz18872.out
 	$(common-objpfx)malloc/mtrace $(objpfx)tst-printf-bz18872.mtrace > $@; \
 	$(evaluate-test)
-endif
 
 CFLAGS-vfprintf.c = -Wno-uninitialized
 CFLAGS-vfwprintf.c = -Wno-uninitialized