From 7abb8992338d73c4d6c142125721626240c27151 Mon Sep 17 00:00:00 2001
From: Filipe Silva <filipe.silva@oracle.com>
Date: Thu, 9 Jun 2022 22:42:08 +0100
Subject: [PATCH] Fix for StringRegressionTest.testBug11614() failures when
 running with wrong default file.encoding.

Change-Id: Ifc6c3c1679717f16ce7ee7cf9569bd832f765c87
---
 build.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/build.xml b/build.xml
index d7e3ae866..8c4e9f5d0 100644
--- a/build.xml
+++ b/build.xml
@@ -1307,6 +1307,7 @@ See also com.mysql.cj.conf.PropertyDefinitions.SYSP_* variables for other test o
                   methods="${com.mysql.cj.testsuite.test.methods}"
                   outputdir="${com.mysql.cj.testsuite.junit.results}">
                 <fork>
+                    <jvmarg value="-Dfile.encoding=UTF-8" />
                     <jvmarg value="-Xmx1024m" />
                     <jvmarg value="${com.mysql.cj.testsuite.test.coverage.jvmargfinal}" />
                     <syspropertyset refid="junit.system.properties" />
@@ -1321,6 +1322,7 @@ See also com.mysql.cj.conf.PropertyDefinitions.SYSP_* variables for other test o
                   name="${com.mysql.cj.testsuite.test.class}"
                   outputdir="${com.mysql.cj.testsuite.junit.results}">
                 <fork>
+                    <jvmarg value="-Dfile.encoding=UTF-8" />
                     <jvmarg value="-Xmx1024m" />
                     <jvmarg value="${com.mysql.cj.testsuite.test.coverage.jvmargfinal}" />
                     <syspropertyset refid="junit.system.properties" />
@@ -1336,6 +1338,7 @@ See also com.mysql.cj.conf.PropertyDefinitions.SYSP_* variables for other test o
                     <exclude name="**/perf/*.class" />
                 </fileset>
                 <fork>
+                    <jvmarg value="-Dfile.encoding=UTF-8" />
                     <jvmarg value="-Xmx1024m" />
                     <jvmarg value="${com.mysql.cj.testsuite.test.coverage.jvmargfinal}" />
                     <syspropertyset refid="junit.system.properties" />