Libguestfs - Sep 2014 - [PATCH] test-charset-fidelity: set iocharset in vfat/msdos FSes

The default charset for these filesystems depends on how the kernel was
configured with, so explicitly set the default one (as specified in
Linux sources), eventually setting later a new one for the tests.
---
 tests/charsets/test-charset-fidelity.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/charsets/test-charset-fidelity.c
b/tests/charsets/test-charset-fidelity.c
index d149a3f..4b34b0e 100644
--- a/tests/charsets/test-charset-fidelity.c
+++ b/tests/charsets/test-charset-fidelity.c
@@ -55,8 +55,8 @@ static struct filesystem filesystems[] = {
   { "ext3",  0, 0, NULL, NULL, 0, 0 },
   { "ext4",  0, 0, NULL, NULL, 0, 0 },
   { "btrfs", 0, 0, NULL, "btrfs", 0, 0 },
-  { "vfat",  1, 0, "utf8", NULL, 1, 1 },
-  { "msdos", 1, 1, NULL, NULL, 0, 0 },
+  { "vfat",  1, 0, "iocharset=iso8859-1,utf8", NULL, 1, 1
},
+  { "msdos", 1, 1, "iocharset=iso8859-1", NULL, 0, 0 },
   /* In reality NTFS is case insensitive, but the ntfs-3g driver isn't. */
   { "ntfs",  0, 0, NULL, "ntfs3g", 0, 0 },
 };
-- 
1.9.3

On Wed, Sep 10, 2014 at 01:13:04PM +0200, Pino Toscano
wrote:
> The default charset for these filesystems depends on how the kernel was
> configured with, so explicitly set the default one (as specified in
> Linux sources), eventually setting later a new one for the tests.
> ---
>  tests/charsets/test-charset-fidelity.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/tests/charsets/test-charset-fidelity.c
b/tests/charsets/test-charset-fidelity.c
> index d149a3f..4b34b0e 100644
> --- a/tests/charsets/test-charset-fidelity.c
> +++ b/tests/charsets/test-charset-fidelity.c
> @@ -55,8 +55,8 @@ static struct filesystem filesystems[] = {
>    { "ext3",  0, 0, NULL, NULL, 0, 0 },
>    { "ext4",  0, 0, NULL, NULL, 0, 0 },
>    { "btrfs", 0, 0, NULL, "btrfs", 0, 0 },
> -  { "vfat",  1, 0, "utf8", NULL, 1, 1 },
> -  { "msdos", 1, 1, NULL, NULL, 0, 0 },
> +  { "vfat",  1, 0, "iocharset=iso8859-1,utf8", NULL,
1, 1 },
> +  { "msdos", 1, 1, "iocharset=iso8859-1", NULL, 0, 0
},
>    /* In reality NTFS is case insensitive, but the ntfs-3g driver
isn't. */
>    { "ntfs",  0, 0, NULL, "ntfs3g", 0, 0 },
>  };
> -- 
ACK.

Rich.

-- 
Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones
Read my programming and virtualization blog: http://rwmj.wordpress.com
virt-p2v converts physical machines to virtual machines.  Boot with a
live CD or over the network (PXE) and turn machines into KVM guests.
http://libguestfs.org/virt-v2v