diff options
| author | Adhemerval Zanella <adhemerval.zanella@linaro.org> | 2022-11-10 14:49:33 -0300 |
|---|---|---|
| committer | Adhemerval Zanella <adhemerval.zanella@linaro.org> | 2022-12-12 09:53:20 -0300 |
| commit | d4facb63ff0349b3c2a83df7363f23a2dbd64a17 (patch) | |
| tree | 9e4a6f2bed3c07bb2435257ac701adb7d009e3e3 /elf/tst-audit25b.c | |
| parent | 4e21c2075193e406a92c0d1cb091a7c804fda4d9 (diff) | |
| download | glibc-d4facb63ff0349b3c2a83df7363f23a2dbd64a17.tar.gz glibc-d4facb63ff0349b3c2a83df7363f23a2dbd64a17.tar.xz glibc-d4facb63ff0349b3c2a83df7363f23a2dbd64a17.zip | |
elf: Do not assume symbol order on tst-audit25{a,b}
The static linker might impose any order or internal function position, so change the test to check if the audit prints the symbol only once in any order.
Diffstat (limited to 'elf/tst-audit25b.c')
| -rw-r--r-- | elf/tst-audit25b.c | 39 |
1 files changed, 25 insertions, 14 deletions
diff --git a/elf/tst-audit25b.c b/elf/tst-audit25b.c index 46391770fd..e1422049b1 100644 --- a/elf/tst-audit25b.c +++ b/elf/tst-audit25b.c @@ -16,6 +16,7 @@ License along with the GNU C Library; if not, see <https://www.gnu.org/licenses/>. */ +#include <array_length.h> #include <errno.h> #include <getopt.h> #include <limits.h> @@ -28,6 +29,8 @@ #include <support/support.h> #include <sys/auxv.h> +#include "tst-audit25.h" + static int restart; #define CMDLINE_OPTIONS \ { "restart", no_argument, &restart, 1 }, @@ -81,13 +84,17 @@ do_test (int argc, char *argv[]) tst-audit25mod2 is built with -Wl,-z,lazy. So only tst_audit25mod4_func1 (called by tst_audit25mod2_func1) should not have LA_SYMB_NOPLTENTER | LA_SYMB_NOPLTEXIT. */ - TEST_COMPARE_STRING (result.err.buffer, - "la_symbind: tst_audit25mod3_func1 1\n" - "la_symbind: tst_audit25mod1_func1 1\n" - "la_symbind: tst_audit25mod2_func1 1\n" - "la_symbind: tst_audit25mod1_func2 1\n" - "la_symbind: tst_audit25mod2_func2 1\n" - "la_symbind: tst_audit25mod4_func1 0\n"); + const char *expected[] = + { + "la_symbind: tst_audit25mod3_func1 1\n", + "la_symbind: tst_audit25mod1_func1 1\n", + "la_symbind: tst_audit25mod2_func1 1\n", + "la_symbind: tst_audit25mod1_func2 1\n", + "la_symbind: tst_audit25mod2_func2 1\n", + "la_symbind: tst_audit25mod4_func1 0\n", + }; + compare_output (result.err.buffer, result.err.length, + expected, array_length(expected)); support_capture_subprocess_free (&result); } @@ -102,13 +109,17 @@ do_test (int argc, char *argv[]) /* With LD_BIND_NOW all symbols are expected to have LA_SYMB_NOPLTENTER | LA_SYMB_NOPLTEXIT. Also the resolution order is done in breadth-first order. */ - TEST_COMPARE_STRING (result.err.buffer, - "la_symbind: tst_audit25mod4_func1 1\n" - "la_symbind: tst_audit25mod3_func1 1\n" - "la_symbind: tst_audit25mod1_func1 1\n" - "la_symbind: tst_audit25mod2_func1 1\n" - "la_symbind: tst_audit25mod1_func2 1\n" - "la_symbind: tst_audit25mod2_func2 1\n"); + const char *expected[] = + { + "la_symbind: tst_audit25mod4_func1 1\n", + "la_symbind: tst_audit25mod3_func1 1\n", + "la_symbind: tst_audit25mod1_func1 1\n", + "la_symbind: tst_audit25mod2_func1 1\n", + "la_symbind: tst_audit25mod1_func2 1\n", + "la_symbind: tst_audit25mod2_func2 1\n", + }; + compare_output (result.err.buffer, result.err.length, + expected, array_length(expected)); support_capture_subprocess_free (&result); } |