]> granicus.if.org Git - zziplib/commitdiff
better show am/cm relation of st_911 / 912
authorGuido Draheim <guidod@gmx.de>
Sun, 3 Jan 2021 15:35:01 +0000 (16:35 +0100)
committerGuido Draheim <guidod@gmx.de>
Sun, 3 Jan 2021 15:35:01 +0000 (16:35 +0100)
testbuilds.py

index 79f4868a4f2fe0ba5c64a9a2c6e9923adeeb215c..7f0a4520926762b9c9932d47c5a7d6224e975cf6 100755 (executable)
@@ -1192,10 +1192,10 @@ 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-cm-build.dockerfile"
@@ -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,10 +1259,10 @@ 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-cm-build.dockerfile"
@@ -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"))
         #