From 70783deaa162348c01c23a8d201f52dee10339d5 Mon Sep 17 00:00:00 2001
From: Edward Welbourne <edward.welbourne@qt.io>
Date: Thu, 28 Jul 2022 17:35:00 +0200
Subject: [PATCH] Update QTimeZone benchmark's list of tested zones
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

It purports to be a list of those named in QDateTime's tests, but was
a bit out of date. In the process, sort them into somewhat coherent
order (to make it easier to verify whether one is missing next time I
check) and reformat.

Change-Id: I16e7ded6f8b00e226513bd06d6174a79f7a0c675
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
(cherry picked from commit 0ed89870788f28daf1504a6204343d6b158b2cf3)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
---
 .../time/qtimezone/tst_bench_qtimezone.cpp    | 25 ++++++++++++-------
 1 file changed, 16 insertions(+), 9 deletions(-)

diff --git a/tests/benchmarks/corelib/time/qtimezone/tst_bench_qtimezone.cpp b/tests/benchmarks/corelib/time/qtimezone/tst_bench_qtimezone.cpp
index 8e8ea4b55cf..8d34ca50a3f 100644
--- a/tests/benchmarks/corelib/time/qtimezone/tst_bench_qtimezone.cpp
+++ b/tests/benchmarks/corelib/time/qtimezone/tst_bench_qtimezone.cpp
@@ -35,15 +35,22 @@ static QList<QByteArray> enoughZones()
     for (conat auto &name : available)
         result << name;
 #else
-    QList<QByteArray> result { QByteArray("UTC"),
-                               // Those named overtly in tst_QDateTime:
-                               QByteArray("Europe/Oslo"), QByteArray("America/Vancouver"),
-                               QByteArray("Europe/Berlin"), QByteArray("America/Sao_Paulo"),
-                               QByteArray("Pacific/Auckland"), QByteArray("Australia/Eucla"),
-                               QByteArray("Asia/Kathmandu"), QByteArray("Pacific/Kiritimati"),
-                               QByteArray("Pacific/Apia"), QByteArray("UTC+12:00"),
-                               QByteArray("Australia/Sydney"), QByteArray("Asia/Singapore"),
-                               QByteArray("Australia/Brisbane") };
+    QList<QByteArray> result {
+        QByteArray("UTC"),
+        // Those named overtly in tst_QDateTime - special cases first:
+        QByteArray("UTC-02:00"), QByteArray("UTC+02:00"), QByteArray("UTC+12:00"),
+        QByteArray("Etc/GMT+3"), QByteArray("GMT-2"), QByteArray("GMT"),
+        // ... then ordinary names in alphabetic order:
+        QByteArray("America/New_York"), QByteArray("America/Sao_Paulo"),
+        QByteArray("America/Vancouver"),
+        QByteArray("Asia/Kathmandu"), QByteArray("Asia/Singapore"),
+        QByteArray("Australia/Brisbane"), QByteArray("Australia/Eucla"),
+        QByteArray("Australia/Sydney"),
+        QByteArray("Europe/Berlin"), QByteArray("Europe/Helsinki"),
+        QByteArray("Europe/Rome"), QByteArray("Europe/Oslo"),
+        QByteArray("Pacific/Apia"), QByteArray("Pacific/Auckland"),
+        QByteArray("Pacific/Kiritimati")
+    };
 #endif
     result << QByteArray("Vulcan/ShiKahr"); // invalid: also worth testing
     return result;