better show cm/nj relations of tests

[zziplib] / testbuilds.py

diff --git a/testbuilds.py b/testbuilds.py
index 35ac70cbdb1aa528b3b8ca2c59048c6d73eb0527..0df6c8b7ff287587fb6bd49a987b775f6c4182c2 100755 (executable)
--- a/testbuilds.py
+++ b/testbuilds.py
@@ -452,11 +452,11 @@ class ZZiplibBuildTest(unittest.TestCase):
         cmd = "docker rmi {images}:{testname}"
         sx____(cmd.format(**locals()))
         self.rm_testdir()
-    def test_211_centos7_build_dockerfile(self):
+    def test_211_centos7_cmake_build_dockerfile(self):
         if not os.path.exists(DOCKER_SOCKET): self.skipTest("docker-based test")
         testname=self.testname()
         testdir = self.testdir()
-        dockerfile="testbuilds/centos7-build.dockerfile"
+        dockerfile="testbuilds/centos7-cm-build.dockerfile"
         addhosts = self.local_addhosts(dockerfile)
         savename = docname(dockerfile)
         saveto = SAVETO
@@ -493,11 +493,11 @@ class ZZiplibBuildTest(unittest.TestCase):
         cmd = "docker rmi {images}:{testname}"
         sx____(cmd.format(**locals()))
         self.rm_testdir()
-    def test_212_centos8_build_dockerfile(self):
+    def test_212_centos8_cmake_build_dockerfile(self):
         if not os.path.exists(DOCKER_SOCKET): self.skipTest("docker-based test")
         testname=self.testname()
         testdir = self.testdir()
-        dockerfile="testbuilds/centos8-build.dockerfile"
+        dockerfile="testbuilds/centos8-cm-build.dockerfile"
         addhosts = self.local_addhosts(dockerfile)
         savename = docname(dockerfile)
         saveto = SAVETO
@@ -834,11 +834,11 @@ class ZZiplibBuildTest(unittest.TestCase):
         cmd = "docker rmi {images}:{testname}"
         sx____(cmd.format(**locals()))
         self.rm_testdir()
-    def test_311_centos7_sdl2_dockerfile(self):
+    def test_311_centos7_cmake_sdl2_dockerfile(self):
         if not os.path.exists(DOCKER_SOCKET): self.skipTest("docker-based test")
         testname=self.testname()
         testdir = self.testdir()
-        dockerfile="testbuilds/centos7-sdl2.dockerfile"
+        dockerfile="testbuilds/centos7-cm-sdl2.dockerfile"
         addhosts = self.local_addhosts(dockerfile)
         savename = docname(dockerfile)
         saveto = SAVETO
@@ -870,11 +870,11 @@ class ZZiplibBuildTest(unittest.TestCase):
         cmd = "docker rmi {images}:{testname}"
         sx____(cmd.format(**locals()))
         self.rm_testdir()
-    def test_312_centos8_sdl2_dockerfile(self):
+    def test_312_centos8_cmake_sdl2_dockerfile(self):
         if not os.path.exists(DOCKER_SOCKET): self.skipTest("docker-based test")
         testname=self.testname()
         testdir = self.testdir()
-        dockerfile="testbuilds/centos8-sdl2.dockerfile"
+        dockerfile="testbuilds/centos8-cm-sdl2.dockerfile"
         addhosts = self.local_addhosts(dockerfile)
         savename = docname(dockerfile)
         saveto = SAVETO
@@ -978,11 +978,11 @@ class ZZiplibBuildTest(unittest.TestCase):
         cmd = "docker rmi {images}:{testname}"
         sx____(cmd.format(**locals()))
         self.rm_testdir()
-    def test_411_centos7_sdl2_destdir_dockerfile(self):
+    def test_411_centos7_cmake_sdl2_destdir_dockerfile(self):
         if not os.path.exists(DOCKER_SOCKET): self.skipTest("docker-based test")
         testname=self.testname()
         testdir = self.testdir()
-        dockerfile="testbuilds/centos7-destdir-sdl2.dockerfile"
+        dockerfile="testbuilds/centos7-cm-destdir-sdl2.dockerfile"
         addhosts = self.local_addhosts(dockerfile)
         savename = docname(dockerfile)
         saveto = SAVETO
@@ -1014,11 +1014,11 @@ class ZZiplibBuildTest(unittest.TestCase):
         cmd = "docker rmi {images}:{testname}"
         sx____(cmd.format(**locals()))
         self.rm_testdir()
-    def test_412_centos8_sdl2_destdir_dockerfile(self):
+    def test_412_centos8_cmake_sdl2_destdir_dockerfile(self):
         if not os.path.exists(DOCKER_SOCKET): self.skipTest("docker-based test")
         testname=self.testname()
         testdir = self.testdir()
-        dockerfile="testbuilds/centos8-destdir-sdl2.dockerfile"
+        dockerfile="testbuilds/centos8-cm-destdir-sdl2.dockerfile"
         addhosts = self.local_addhosts(dockerfile)
         savename = docname(dockerfile)
         saveto = SAVETO
@@ -1192,13 +1192,13 @@ class ZZiplibBuildTest(unittest.TestCase):
         cmd = "docker rmi {images}:{testname}"
         sx____(cmd.format(**locals()))
         self.rm_testdir()
-    def test_9211_centos7_automake_dockerfile(self):
+    def test_911_centos7_am_cm_dockerfile(self):
         if not os.path.exists(DOCKER_SOCKET): self.skipTest("docker-based test")
-        testname1=self.testname() + "_1"
-        testname2=self.testname() + "_2"
+        testname1=self.testname() + "_am"
+        testname2=self.testname() + "_cm"
         testdir = self.testdir()
         dockerfile1="testbuilds/centos7-am-build.dockerfile"
-        dockerfile2="testbuilds/centos7-build.dockerfile"
+        dockerfile2="testbuilds/centos7-cm-build.dockerfile"
         addhosts = self.local_addhosts(dockerfile1)
         savename1 = docname(dockerfile1)
         savename2 = docname(dockerfile2)
@@ -1249,6 +1249,8 @@ class ZZiplibBuildTest(unittest.TestCase):
         cmd = "docker exec {testname1} diff -urw --no-dereference /usr/local /new/local --exclude _config.h"
         sx____(cmd.format(**locals()))
         out = output(cmd.format(**locals()))
+        if "---" in out or "Only" in out:
+            logg.warning("out>>\n%s", out)
         self.assertFalse(greps(out, "---"))
         self.assertFalse(greps(out, "Only"))
         #
@@ -1257,13 +1259,13 @@ class ZZiplibBuildTest(unittest.TestCase):
         cmd = "docker rm --force {testname2}"
         sx____(cmd.format(**locals()))
         self.rm_testdir()
-    def test_9212_centos7_automake_dockerfile(self):
+    def test_912_centos8_am_cm_dockerfile(self):
         if not os.path.exists(DOCKER_SOCKET): self.skipTest("docker-based test")
-        testname1=self.testname() + "_1"
-        testname2=self.testname() + "_2"
+        testname1=self.testname() + "_am"
+        testname2=self.testname() + "_cm"
         testdir = self.testdir()
         dockerfile1="testbuilds/centos8-am-build.dockerfile"
-        dockerfile2="testbuilds/centos8-build.dockerfile"
+        dockerfile2="testbuilds/centos8-cm-build.dockerfile"
         addhosts = self.local_addhosts(dockerfile1)
         savename1 = docname(dockerfile1)
         savename2 = docname(dockerfile2)
@@ -1314,6 +1316,8 @@ class ZZiplibBuildTest(unittest.TestCase):
         cmd = "docker exec {testname1} diff -urw --no-dereference /usr/local /new/local --exclude _config.h"
         sx____(cmd.format(**locals()))
         out = output(cmd.format(**locals()))
+        if "---" in out or "Only" in out:
+            logg.warning("out>>\n%s", out)
         self.assertFalse(greps(out, "---"))
         self.assertFalse(greps(out, "Only"))
         #
@@ -1322,13 +1326,13 @@ class ZZiplibBuildTest(unittest.TestCase):
         cmd = "docker rm --force {testname2}"
         sx____(cmd.format(**locals()))
         self.rm_testdir()
-    def test_9311_centos7_automake_sdl2_dockerfile(self):
+    def test_931_centos7_am_cm_sdl2_dockerfile(self):
         if not os.path.exists(DOCKER_SOCKET): self.skipTest("docker-based test")
-        testname1=self.testname() + "_1"
-        testname2=self.testname() + "_2"
+        testname1=self.testname() + "_am"
+        testname2=self.testname() + "_cm"
         testdir = self.testdir()
         dockerfile1="testbuilds/centos7-am-sdl2.dockerfile"
-        dockerfile2="testbuilds/centos7-sdl2.dockerfile"
+        dockerfile2="testbuilds/centos7-cm-sdl2.dockerfile"
         addhosts = self.local_addhosts(dockerfile1)
         savename1 = docname(dockerfile1)
         savename2 = docname(dockerfile2)
@@ -1379,6 +1383,8 @@ class ZZiplibBuildTest(unittest.TestCase):
         cmd = "docker exec {testname1} diff -urw --no-dereference /usr/local /new/local --exclude _config.h"
         sx____(cmd.format(**locals()))
         out = output(cmd.format(**locals()))
+        if "---" in out or "Only" in out:
+            logg.warning("out>>\n%s", out)
         self.assertFalse(greps(out, "---"))
         self.assertFalse(greps(out, "Only"))
         #
@@ -1387,13 +1393,13 @@ class ZZiplibBuildTest(unittest.TestCase):
         cmd = "docker rm --force {testname2}"
         sx____(cmd.format(**locals()))
         self.rm_testdir()
-    def test_9312_centos7_automake_sdl2_dockerfile(self):
+    def test_932_centos7_am_cm_sdl2_dockerfile(self):
         if not os.path.exists(DOCKER_SOCKET): self.skipTest("docker-based test")
-        testname1=self.testname() + "_1"
-        testname2=self.testname() + "_2"
+        testname1=self.testname() + "_am"
+        testname2=self.testname() + "_cm"
         testdir = self.testdir()
         dockerfile1="testbuilds/centos8-am-sdl2.dockerfile"
-        dockerfile2="testbuilds/centos8-sdl2.dockerfile"
+        dockerfile2="testbuilds/centos8-cm-sdl2.dockerfile"
         addhosts = self.local_addhosts(dockerfile1)
         savename1 = docname(dockerfile1)
         savename2 = docname(dockerfile2)
@@ -1444,6 +1450,8 @@ class ZZiplibBuildTest(unittest.TestCase):
         cmd = "docker exec {testname1} diff -urw --no-dereference /usr/local /new/local --exclude _config.h"
         sx____(cmd.format(**locals()))
         out = output(cmd.format(**locals()))
+        if "---" in out or "Only" in out:
+            logg.warning("out>>\n%s", out)
         self.assertFalse(greps(out, "---"))
         self.assertFalse(greps(out, "Only"))
         #
@@ -1452,13 +1460,13 @@ class ZZiplibBuildTest(unittest.TestCase):
         cmd = "docker rm --force {testname2}"
         sx____(cmd.format(**locals()))
         self.rm_testdir()
-    def test_9411_centos7_automake_sdl2_dockerfile(self):
+    def test_941_centos7_cm_sdl2_or_destdir_dockerfile(self):
         if not os.path.exists(DOCKER_SOCKET): self.skipTest("docker-based test")
-        testname1=self.testname() + "_1"
-        testname2=self.testname() + "_2"
+        testname1=self.testname() + "_usr"
+        testname2=self.testname() + "_new"
         testdir = self.testdir()
-        dockerfile1="testbuilds/centos7-sdl2.dockerfile"
-        dockerfile2="testbuilds/centos7-destdir-sdl2.dockerfile"
+        dockerfile1="testbuilds/centos7-cm-sdl2.dockerfile"
+        dockerfile2="testbuilds/centos7-cm-destdir-sdl2.dockerfile"
         addhosts = self.local_addhosts(dockerfile1)
         savename1 = docname(dockerfile1)
         savename2 = docname(dockerfile2)
@@ -1496,6 +1504,8 @@ class ZZiplibBuildTest(unittest.TestCase):
         cmd = "docker exec {testname1} diff -urw --no-dereference /usr/local /new/local"
         sx____(cmd.format(**locals()))
         out = output(cmd.format(**locals()))
+        if "---" in out or "Only" in out:
+            logg.warning("out>>\n%s", out)
         self.assertFalse(greps(out, "---"))
         self.assertFalse(greps(out, "Only"))
         #
@@ -1504,13 +1514,13 @@ class ZZiplibBuildTest(unittest.TestCase):
         cmd = "docker rm --force {testname2}"
         sx____(cmd.format(**locals()))
         self.rm_testdir()
-    def test_9412_centos7_automake_sdl2_dockerfile(self):
+    def test_942_centos7_cm_sdl2_or_destdir_dockerfile(self):
         if not os.path.exists(DOCKER_SOCKET): self.skipTest("docker-based test")
-        testname1=self.testname() + "_1"
-        testname2=self.testname() + "_2"
+        testname1=self.testname() + "_usr"
+        testname2=self.testname() + "_new"
         testdir = self.testdir()
-        dockerfile1="testbuilds/centos8-sdl2.dockerfile"
-        dockerfile2="testbuilds/centos8-destdir-sdl2.dockerfile"
+        dockerfile1="testbuilds/centos8-cm-sdl2.dockerfile"
+        dockerfile2="testbuilds/centos8-cm-destdir-sdl2.dockerfile"
         addhosts = self.local_addhosts(dockerfile1)
         savename1 = docname(dockerfile1)
         savename2 = docname(dockerfile2)
@@ -1548,6 +1558,8 @@ class ZZiplibBuildTest(unittest.TestCase):
         cmd = "docker exec {testname1} diff -urw --no-dereference /usr/local /new/local"
         sx____(cmd.format(**locals()))
         out = output(cmd.format(**locals()))
+        if "---" in out or "Only" in out:
+            logg.warning("out>>\n%s", out)
         self.assertFalse(greps(out, "---"))
         self.assertFalse(greps(out, "Only"))
         #
@@ -1556,10 +1568,10 @@ class ZZiplibBuildTest(unittest.TestCase):
         cmd = "docker rm --force {testname2}"
         sx____(cmd.format(**locals()))
         self.rm_testdir()
-    def test_9431_opensuse_ninja_sdl2_dockerfile(self):
+    def test_963_opensuse_cm_or_nj_sdl2_dockerfile(self):
         if not os.path.exists(DOCKER_SOCKET): self.skipTest("docker-based test")
-        testname1=self.testname() + "_1"
-        testname2=self.testname() + "_2"
+        testname1=self.testname() + "_cm"
+        testname2=self.testname() + "_nj"
         testdir = self.testdir()
         dockerfile1="testbuilds/opensuse15-sdl2.dockerfile"
         dockerfile2="testbuilds/opensuse15-ninja-sdl2.dockerfile"
@@ -1595,6 +1607,8 @@ class ZZiplibBuildTest(unittest.TestCase):
         cmd = "docker exec {testname1} diff -urw --no-dereference /usr/local /new/local"
         sx____(cmd.format(**locals()))
         out = output(cmd.format(**locals()))
+        if "---" in out or "Only" in out:
+            logg.warning("out>>\n%s", out)
         self.assertFalse(greps(out, "---"))
         self.assertFalse(greps(out, "Only"))
         #
@@ -1603,10 +1617,10 @@ class ZZiplibBuildTest(unittest.TestCase):
         cmd = "docker rm --force {testname2}"
         sx____(cmd.format(**locals()))
         self.rm_testdir()
-    def test_9711_centos7_docs_dockerfile(self):
+    def test_977_centos7_am_cm_docs_dockerfile(self):
         if not os.path.exists(DOCKER_SOCKET): self.skipTest("docker-based test")
-        testname1=self.testname() + "_1"
-        testname2=self.testname() + "_2"
+        testname1=self.testname() + "_am"
+        testname2=self.testname() + "_cm"
         testdir = self.testdir()
         dockerfile1="testbuilds/centos7-am-docs.dockerfile"
         dockerfile2="testbuilds/centos7-docs.dockerfile"
@@ -1648,6 +1662,8 @@ class ZZiplibBuildTest(unittest.TestCase):
         cmd = "docker exec {testname1} diff -urw --no-dereference --brief /usr/local /new/local"
         sx____(cmd.format(**locals()))
         out = output(cmd.format(**locals()))
+        if "---" in out or "Only" in out:
+            logg.warning("out>>\n%s", out)
         self.assertFalse(greps(out, "---"))
         self.assertFalse(greps(out, "Only"))
         #