Merge'em

Author: StanFromIreland

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

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):