From 63487304d3e305c27adb5ebe3c547df400e39c3c Mon Sep 17 00:00:00 2001
From: Stan Ulbrych <stan@ulbrych.org>
Date: Thu, 19 Feb 2026 15:37:15 +0000
Subject: [PATCH 1/4] Run tests that require `tzdata` on `stan-aarch64-ubuntu`

---
 master/custom/builders.py  | 2 ++
 master/custom/factories.py | 6 ++++++
 2 files changed, 8 insertions(+)

diff --git a/master/custom/builders.py b/master/custom/builders.py
index 57054718..85d6c0cd 100644
--- a/master/custom/builders.py
+++ b/master/custom/builders.py
@@ -211,6 +211,8 @@
 
     # test_xpickle
     ("aarch64 Ubuntu test_xpickle", "stan-aarch64-ubuntu", UnixXPickleBuild),
+    # Tests that require the 'tzdata' resource
+    ("aarch64 Ubuntu tzdata", "stan-aarch64-ubuntu", UnixTzdataBuild),
 
     # Linux x86-64 GCC
     # Fedora Rawhide is unstable
diff --git a/master/custom/factories.py b/master/custom/factories.py
index f82c6ff2..52fe84b9 100644
--- a/master/custom/factories.py
+++ b/master/custom/factories.py
@@ -290,6 +290,12 @@ class UnixBigmemBuild(UnixBuild):
     factory_tags = ["bigmem"]
 
 
+class UnixTzdataBuild(UnixBuild):
+    buildersuffix = ".tzdata"
+    testFlags = ["-utzdata", "test_zoneinfo", "test_datetime"]
+    factory_tags = ["tzdata"]
+
+
 class UnixXPickleBuild(UnixBuild):
     buildersuffix = ".xpickle"
     testFlags = ["-uxpickle", "test_xpickle"]

From 9108a9d0b05a887b05469680234c4245db3bec74 Mon Sep 17 00:00:00 2001
From: Stan Ulbrych <stan@ulbrych.org>
Date: Thu, 19 Feb 2026 15:40:18 +0000
Subject: [PATCH 2/4] !fixup

---
 master/custom/builders.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/master/custom/builders.py b/master/custom/builders.py
index 85d6c0cd..6597d6ba 100644
--- a/master/custom/builders.py
+++ b/master/custom/builders.py
@@ -2,6 +2,7 @@
     UnixBuild,
     UnixPerfBuild,
     UnixXPickleBuild,
+    UnixTzdataBuild,
     RHEL8Build,
     CentOS9Build,
     FedoraStableBuild,

From 20b0a445d797cf275957646f24fbb8a4a411db74 Mon Sep 17 00:00:00 2001
From: Stan Ulbrych <stan@ulbrych.org>
Date: Thu, 19 Feb 2026 16:01:26 +0000
Subject: [PATCH 3/4] Merge'em

---
 master/custom/builders.py  |  9 +++------
 master/custom/factories.py | 15 +++++----------
 2 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/master/custom/builders.py b/master/custom/builders.py
index 6597d6ba..a6baafca 100644
--- a/master/custom/builders.py
+++ b/master/custom/builders.py
@@ -1,8 +1,7 @@
 from custom.factories import (
     UnixBuild,
     UnixPerfBuild,
-    UnixXPickleBuild,
-    UnixTzdataBuild,
+    UnixOddballsBuild,
     RHEL8Build,
     CentOS9Build,
     FedoraStableBuild,
@@ -210,10 +209,8 @@
     # Ubuntu Linux AArch64
     ("aarch64 Ubuntu 24.04 BigMem", "diegorusso-aarch64-bigmem", UnixBigmemBuild),
 
-    # test_xpickle
-    ("aarch64 Ubuntu test_xpickle", "stan-aarch64-ubuntu", UnixXPickleBuild),
-    # Tests that require the 'tzdata' resource
-    ("aarch64 Ubuntu tzdata", "stan-aarch64-ubuntu", UnixTzdataBuild),
+    # Tests that require the 'tzdata' and 'xpickle' resources
+    ("aarch64 Ubuntu Oddballs", "stan-aarch64-ubuntu", UnixOddballsBuild),
 
     # Linux x86-64 GCC
     # Fedora Rawhide is unstable
diff --git a/master/custom/factories.py b/master/custom/factories.py
index 52fe84b9..6c633562 100644
--- a/master/custom/factories.py
+++ b/master/custom/factories.py
@@ -290,16 +290,11 @@ class UnixBigmemBuild(UnixBuild):
     factory_tags = ["bigmem"]
 
 
-class UnixTzdataBuild(UnixBuild):
-    buildersuffix = ".tzdata"
-    testFlags = ["-utzdata", "test_zoneinfo", "test_datetime"]
-    factory_tags = ["tzdata"]
-
-
-class UnixXPickleBuild(UnixBuild):
-    buildersuffix = ".xpickle"
-    testFlags = ["-uxpickle", "test_xpickle"]
-    factory_tags = ["xpickle"]
+class UnixOddballsBuild(UnixBuild):
+    buildersuffix = ".oddballs"
+    testFlags = ["-uxpickle", "test_xpickle",
+                 "-utzdata", "test_zoneinfo", "test_datetime"]
+    factory_tags = ["xpickle", "tzdata"]
 
 
 class NonDebugUnixBuild(UnixBuild):

From 8923cd9ac68ce93a7fbfc4f3e630bbb192721d3c Mon Sep 17 00:00:00 2001
From: Stan Ulbrych <89152624+StanFromIreland@users.noreply.github.com>
Date: Thu, 19 Feb 2026 18:41:10 +0000
Subject: [PATCH 4/4] UpdatetestFlags list

Co-authored-by: Victor Stinner <vstinner@python.org>
---
 master/custom/factories.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/master/custom/factories.py b/master/custom/factories.py
index 6c633562..1754d1ae 100644
--- a/master/custom/factories.py
+++ b/master/custom/factories.py
@@ -292,8 +292,8 @@ class UnixBigmemBuild(UnixBuild):
 
 class UnixOddballsBuild(UnixBuild):
     buildersuffix = ".oddballs"
-    testFlags = ["-uxpickle", "test_xpickle",
-                 "-utzdata", "test_zoneinfo", "test_datetime"]
+    testFlags = ["-u", "xpickle,tzdata",
+                 "test_xpickle", "test_zoneinfo", "test_datetime"]
     factory_tags = ["xpickle", "tzdata"]