summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorRobert Griebl <robert.griebl@qt.io>2023-12-15 10:56:55 +0100
committerRobert Griebl <robert.griebl@qt.io>2023-12-15 14:21:26 +0100
commitf6daf2dd3b5e77e6f4d489441dd9cfadcc738d85 (patch)
treee3183a7bdf3154c781a5026dca06c044b58c75e4 /tests
parentf42443655b2852641ceee5863b05d53f1a87772d (diff)
Get rid of the UTF-8 locale check for libarchive
Modern libarchive 3 versions are able to deal with UTF-8 encodings explicitly, so we don't have to rely on the locale setting of the whole process for libarchive to pick up the right encoding implicitly. Change-Id: I002deb582a9267d11361520b1d514f4b43ee2a5e Pick-to: 6.7 Reviewed-by: Dominik Holland <dominik.holland@qt.io>
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/applicationinstaller/tst_applicationinstaller.cpp3
-rw-r--r--tests/auto/packagecreator/tst_packagecreator.cpp3
-rw-r--r--tests/auto/packageextractor/tst_packageextractor.cpp3
3 files changed, 0 insertions, 9 deletions
diff --git a/tests/auto/applicationinstaller/tst_applicationinstaller.cpp b/tests/auto/applicationinstaller/tst_applicationinstaller.cpp
index c6e4b6ec..0dd8df74 100644
--- a/tests/auto/applicationinstaller/tst_applicationinstaller.cpp
+++ b/tests/auto/applicationinstaller/tst_applicationinstaller.cpp
@@ -209,7 +209,6 @@ void tst_PackageManager::initTestCase()
spyTimeout *= timeoutFactor();
- QVERIFY(PackageUtilities::checkCorrectLocale());
QVERIFY2(startedSudoServer, qPrintable(sudoServerError));
m_sudo = SudoClient::instance();
QVERIFY(m_sudo);
@@ -786,8 +785,6 @@ static tst_PackageManager *tstPackageManager = nullptr;
int main(int argc, char **argv)
{
- PackageUtilities::ensureCorrectLocale();
-
try {
Sudo::forkServer(Sudo::DropPrivilegesPermanently);
startedSudoServer = true;
diff --git a/tests/auto/packagecreator/tst_packagecreator.cpp b/tests/auto/packagecreator/tst_packagecreator.cpp
index 3218159b..bc748ee0 100644
--- a/tests/auto/packagecreator/tst_packagecreator.cpp
+++ b/tests/auto/packagecreator/tst_packagecreator.cpp
@@ -56,8 +56,6 @@ void tst_PackageCreator::initTestCase()
m_isCygwin = tar.readAllStandardOutput().contains("Cygwin");
- QVERIFY(PackageUtilities::checkCorrectLocale());
-
if (!QDir(qL1S(AM_TESTDATA_DIR "/packages")).exists())
QSKIP("No test packages available in the data/ directory");
}
@@ -152,7 +150,6 @@ QString tst_PackageCreator::escapeFilename(const QString &name)
int main(int argc, char *argv[])
{
- PackageUtilities::ensureCorrectLocale();
QCoreApplication app(argc, argv);
app.setAttribute(Qt::AA_Use96Dpi, true);
tst_PackageCreator tc;
diff --git a/tests/auto/packageextractor/tst_packageextractor.cpp b/tests/auto/packageextractor/tst_packageextractor.cpp
index 877966ef..43d1fd75 100644
--- a/tests/auto/packageextractor/tst_packageextractor.cpp
+++ b/tests/auto/packageextractor/tst_packageextractor.cpp
@@ -58,8 +58,6 @@ void tst_PackageExtractor::initTestCase()
{
if (!QDir(qL1S(AM_TESTDATA_DIR "/packages")).exists())
QSKIP("No test packages available in the data/ directory");
-
- QVERIFY(PackageUtilities::checkCorrectLocale());
}
void tst_PackageExtractor::init()
@@ -279,7 +277,6 @@ void tst_PackageExtractor::extractFromFifo()
int main(int argc, char *argv[])
{
- PackageUtilities::ensureCorrectLocale();
QCoreApplication app(argc, argv);
app.setAttribute(Qt::AA_Use96Dpi, true);
tst_PackageExtractor tc;