[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[patches] Fix auditing tests for cross-testing
- To: patches@xxxxxxxxxx
- Subject: [patches] Fix auditing tests for cross-testing
- From: "Joseph S. Myers" <joseph@xxxxxxxxxxxxxxxx>
- Date: Mon, 22 Mar 2010 21:20:26 +0000 (UTC)
When merging changes from FSF glibc I missed the need to update added
elf/tst-audit* tests to work properly with cross-testing by using the
wrapper that converts EGLIBC_TEST_LD_* environment variables to LD_*.
I've now applied this patch to trunk and 2.11 branch to fix such issues.
Index: ChangeLog.eglibc
===================================================================
--- ChangeLog.eglibc (revision 10083)
+++ ChangeLog.eglibc (working copy)
@@ -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.
+
2010-03-15 Joseph Myers <joseph@xxxxxxxxxxxxxxxx>
* configure.in: Don't prepend $srcdir to absolute path to elf
Index: elf/Makefile
===================================================================
--- elf/Makefile (revision 10083)
+++ elf/Makefile (working copy)
@@ -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
--
Joseph S. Myers
joseph@xxxxxxxxxxxxxxxx