From: Alexandra Hájková Date: Tue, 30 Sep 2025 13:54:58 +0000 (-0400) Subject: getdents_filter.vgtest: Add filter_sort X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a08e6ed08f6b24ecf35d443b52e5db16ccb05f77;p=thirdparty%2Fvalgrind.git getdents_filter.vgtest: Add filter_sort On some file systems the testfiles 1000 and 1001 come out in different order. Add filter_sort to sort the output lines to always appear at the same order. --- diff --git a/.gitignore b/.gitignore index 645f261bc..01dd2a3bc 100644 --- a/.gitignore +++ b/.gitignore @@ -1916,6 +1916,7 @@ /none/tests/linux/open_client /none/tests/linux/pthread-stack /none/tests/linux/stack-overflow +/none/tests/linux/getdents_filter # /none/tests/mips32/ /none/tests/mips32/Makefile diff --git a/none/tests/Makefile.am b/none/tests/Makefile.am index f75de49f4..a95d66436 100644 --- a/none/tests/Makefile.am +++ b/none/tests/Makefile.am @@ -92,7 +92,8 @@ dist_noinst_SCRIPTS = \ filter_stderr \ filter_timestamp \ filter_xml \ - allexec_prepare_prereq + allexec_prepare_prereq \ + filter_sort noinst_HEADERS = fdleak.h diff --git a/none/tests/filter_sort b/none/tests/filter_sort new file mode 100755 index 000000000..5c376236c --- /dev/null +++ b/none/tests/filter_sort @@ -0,0 +1,2 @@ +#!/bin/sh +sort diff --git a/none/tests/linux/getdents_filter.stdout.exp b/none/tests/linux/getdents_filter.stdout.exp index c228ee81f..7d29d0f66 100644 --- a/none/tests/linux/getdents_filter.stdout.exp +++ b/none/tests/linux/getdents_filter.stdout.exp @@ -1,9 +1,3 @@ -retry_test_start -retry:0 -retry:1 -retry:2 -retry:3 -retry_test_end 0 1 2 @@ -14,3 +8,9 @@ fdinfo:2 fdinfo:3 regular:1000 regular:1001 +retry:0 +retry:1 +retry:2 +retry:3 +retry_test_end +retry_test_start diff --git a/none/tests/linux/getdents_filter.vgtest b/none/tests/linux/getdents_filter.vgtest index eb5bd6ceb..612ebcec2 100644 --- a/none/tests/linux/getdents_filter.vgtest +++ b/none/tests/linux/getdents_filter.vgtest @@ -1,2 +1,3 @@ prog: getdents_filter vgopts: -q +stdout_filter: ../filter_sort