From 205d8ebd4a362f281c12ac9c78a98449e904e956 Mon Sep 17 00:00:00 2001 From: Auke Kok Date: Wed, 5 Jul 2023 14:01:51 -0400 Subject: [PATCH] Account for quoting style changes in coreutils. In older versions of coreutils, quoted strings are occasionally output using utf-8 open/close single quotes. New versions of coreutils will exclusively use the ASCII single quote character "'" when the output is not a TTY - as is the case with all test scripts. We can avoid most of these problems by always setting LC_ALL=C in testing, however. Signed-off-by: Auke Kok --- tests/golden/basic-posix-consistency | 2 +- tests/golden/inode-deletion | 2 +- tests/golden/offline-extent-waiting | 4 ++-- tests/run-tests.sh | 3 +++ 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/tests/golden/basic-posix-consistency b/tests/golden/basic-posix-consistency index 2c5fb6ab..3bf10ae1 100644 --- a/tests/golden/basic-posix-consistency +++ b/tests/golden/basic-posix-consistency @@ -47,7 +47,7 @@ four --- dir within dir --- overwrite file --- can't overwrite non-empty dir -mv: cannot move ‘/mnt/test/test/basic-posix-consistency/dir/c/clobber’ to ‘/mnt/test/test/basic-posix-consistency/dir/a/dir’: Directory not empty +mv: cannot move '/mnt/test/test/basic-posix-consistency/dir/c/clobber' to '/mnt/test/test/basic-posix-consistency/dir/a/dir': Directory not empty --- can overwrite empty dir --- can rename into root == path resoluion diff --git a/tests/golden/inode-deletion b/tests/golden/inode-deletion index 1e36ff37..f586d563 100644 --- a/tests/golden/inode-deletion +++ b/tests/golden/inode-deletion @@ -17,7 +17,7 @@ ino not found in dseq index mount 0 contents after mount 1 rm: contents ino found in dseq index ino found in dseq index -stat: cannot stat ‘/mnt/test/test/inode-deletion/file’: No such file or directory +stat: cannot stat '/mnt/test/test/inode-deletion/file': No such file or directory ino not found in dseq index ino not found in dseq index == lots of deletions use one open map diff --git a/tests/golden/offline-extent-waiting b/tests/golden/offline-extent-waiting index 5b4af2d2..9ea47d4f 100644 --- a/tests/golden/offline-extent-waiting +++ b/tests/golden/offline-extent-waiting @@ -20,10 +20,10 @@ offline waiting should now have two known entries: data_wait_err found 2 waiters. offline waiting should now have 0 known entries: 0 -dd: error reading ‘/mnt/test/test/offline-extent-waiting/dir/file’: Input/output error +dd: error reading '/mnt/test/test/offline-extent-waiting/dir/file': Input/output error 0+0 records in 0+0 records out -dd: error reading ‘/mnt/test/test/offline-extent-waiting/dir/file’: Input/output error +dd: error reading '/mnt/test/test/offline-extent-waiting/dir/file': Input/output error 0+0 records in 0+0 records out offline waiting should be empty again: diff --git a/tests/run-tests.sh b/tests/run-tests.sh index a9613687..1202cada 100755 --- a/tests/run-tests.sh +++ b/tests/run-tests.sh @@ -1,5 +1,8 @@ #!/usr/bin/bash +# Force system tools to use ASCII quotes +export LC_ALL=C + # # XXX # - could have helper functions for waiting for pids