[commits] r10085 - in /branches/eglibc-2_11/libc: ChangeLog.eglibc elf/Makefile

[joseph@xxxxxxxxxx]

Author: joseph
Date: Mon Mar 22 14:19:13 2010
New Revision: 10085

Log:
	* elf/Makefile (tst-audit3-ENV, tst-audit4-ENV, tst-audit5-ENV,
	tst-audit6-ENV, tst-audit7-ENV): Use EGLIBC_TEST_LD_AUDIT instead
	of LD_AUDIT.
	(tst-audit3-WRAPPER, tst-audit4-WRAPPER, tst-audit5-WRAPPER,
	tst-audit6-WRAPPER, tst-audit7-WRAPPER): Define.

Modified:
    branches/eglibc-2_11/libc/ChangeLog.eglibc
    branches/eglibc-2_11/libc/elf/Makefile

Modified: branches/eglibc-2_11/libc/ChangeLog.eglibc
==============================================================================
--- branches/eglibc-2_11/libc/ChangeLog.eglibc (original)
+++ branches/eglibc-2_11/libc/ChangeLog.eglibc Mon Mar 22 14:19:13 2010
@@ -1,3 +1,11 @@
+2010-03-22  Joseph Myers  <joseph@xxxxxxxxxxxxxxxx>
+
+	* elf/Makefile (tst-audit3-ENV, tst-audit4-ENV, tst-audit5-ENV,
+	tst-audit6-ENV, tst-audit7-ENV): Use EGLIBC_TEST_LD_AUDIT instead
+	of LD_AUDIT.
+	(tst-audit3-WRAPPER, tst-audit4-WRAPPER, tst-audit5-WRAPPER,
+	tst-audit6-WRAPPER, tst-audit7-WRAPPER): Define.
+
 2009-11-20  Maxim Kuvyrkov  <maxim@xxxxxxxxxxxxxxxx>
 
 	Backport from trunk:

Modified: branches/eglibc-2_11/libc/elf/Makefile
==============================================================================
--- branches/eglibc-2_11/libc/elf/Makefile (original)
+++ branches/eglibc-2_11/libc/elf/Makefile Mon Mar 22 14:19:13 2010
@@ -992,24 +992,29 @@
 
 $(objpfx)tst-audit3: $(objpfx)tst-auditmod3a.so
 $(objpfx)tst-audit3.out: $(objpfx)tst-auditmod3b.so
-tst-audit3-ENV = LD_AUDIT=$(objpfx)tst-auditmod3b.so
+tst-audit3-ENV = EGLIBC_TEST_LD_AUDIT=$(objpfx)tst-auditmod3b.so
+tst-audit3-WRAPPER = $(..)scripts/run-with-env.sh
 
 $(objpfx)tst-audit4: $(objpfx)tst-auditmod4a.so
 $(objpfx)tst-audit4.out: $(objpfx)tst-auditmod4b.so
-tst-audit4-ENV = LD_AUDIT=$(objpfx)tst-auditmod4b.so
+tst-audit4-ENV = EGLIBC_TEST_LD_AUDIT=$(objpfx)tst-auditmod4b.so
+tst-audit4-WRAPPER = $(..)scripts/run-with-env.sh
 
 $(objpfx)tst-audit5: $(objpfx)tst-auditmod5a.so
 $(objpfx)tst-audit5.out: $(objpfx)tst-auditmod5b.so
-tst-audit5-ENV = LD_AUDIT=$(objpfx)tst-auditmod5b.so
+tst-audit5-ENV = EGLIBC_TEST_LD_AUDIT=$(objpfx)tst-auditmod5b.so
+tst-audit5-WRAPPER = $(..)scripts/run-with-env.sh
 
 $(objpfx)tst-audit6: $(objpfx)tst-auditmod6a.so
 $(objpfx)tst-audit6.out: $(objpfx)tst-auditmod6b.so \
 			 $(objpfx)tst-auditmod6c.so
-tst-audit6-ENV = LD_AUDIT=$(objpfx)tst-auditmod6b.so:$(objpfx)tst-auditmod6c.so
+tst-audit6-ENV = EGLIBC_TEST_LD_AUDIT=$(objpfx)tst-auditmod6b.so:$(objpfx)tst-auditmod6c.so
+tst-audit6-WRAPPER = $(..)scripts/run-with-env.sh
 
 $(objpfx)tst-audit7: $(objpfx)tst-auditmod7a.so
 $(objpfx)tst-audit7.out: $(objpfx)tst-auditmod7b.so
-tst-audit7-ENV = LD_AUDIT=$(objpfx)tst-auditmod7b.so
+tst-audit7-ENV = EGLIBC_TEST_LD_AUDIT=$(objpfx)tst-auditmod7b.so
+tst-audit7-WRAPPER = $(..)scripts/run-with-env.sh
 
 $(objpfx)tst-global1: $(libdl)
 $(objpfx)tst-global1.out: $(objpfx)testobj6.so $(objpfx)testobj2.so