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 645f261bcd22a582485be54c6c0a613d7455cbe0..01dd2a3bc632a398d10a3996597aa3e668f1bb9e 100644 (file)
--- 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 f75de49f46a729d0e20dacb1404551e1586ec6ee..a95d66436df8a8eb4cdb465a21167ffe50494ace 100644 (file)
--- 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 (executable)
index 0000000..5c37623
--- /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 c228ee81fd2fd31dbc1fe43ffe3ed152d7a09b4e..7d29d0f664f7a0898e7aba78255b5cfd58d55ff7 100644 (file)
--- 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 eb5bd6cebdff0b16e58126110f140a7ac81a6a05..612ebcec270148309dee3d37e21df67a1c55784f 100644 (file)
--- 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