diff options
Diffstat (limited to 'dev-libs/zziplib/files/zziplib-0.13.71-testbuilds-opensuse15-ninja-sdl2.patch')
| -rw-r--r-- | dev-libs/zziplib/files/zziplib-0.13.71-testbuilds-opensuse15-ninja-sdl2.patch | 137 |
1 files changed, 0 insertions, 137 deletions
diff --git a/dev-libs/zziplib/files/zziplib-0.13.71-testbuilds-opensuse15-ninja-sdl2.patch b/dev-libs/zziplib/files/zziplib-0.13.71-testbuilds-opensuse15-ninja-sdl2.patch deleted file mode 100644 index d2436ae90120..000000000000 --- a/dev-libs/zziplib/files/zziplib-0.13.71-testbuilds-opensuse15-ninja-sdl2.patch +++ /dev/null @@ -1,137 +0,0 @@ -commit ddaa538e8cfa46413b0e92613b54123e4b759616 -Author: Guido Draheim <guidod@gmx.de> -Date: Fri Apr 17 20:46:30 2020 +0200 - - #88 adding testbuilds/opensuse15-ninja-sdl2.dockerfile - -diff --git a/testbuilds.py b/testbuilds.py -index 756e77e..35ac70c 100755 ---- a/testbuilds.py -+++ b/testbuilds.py -@@ -1080,6 +1080,42 @@ class ZZiplibBuildTest(unittest.TestCase): - cmd = "docker rmi {images}:{testname}" - sx____(cmd.format(**locals())) - self.rm_testdir() -+ def test_431_opensuse15_ninja_sdl2_dockerfile(self): -+ if not os.path.exists(DOCKER_SOCKET): self.skipTest("docker-based test") -+ testname=self.testname() -+ testdir = self.testdir() -+ dockerfile="testbuilds/opensuse15-ninja-sdl2.dockerfile" -+ addhosts = self.local_addhosts(dockerfile) -+ savename = docname(dockerfile) -+ saveto = SAVETO -+ images = IMAGES -+ build = "build --build-arg=no_check=true" -+ cmd = "docker {build} . -f {dockerfile} {addhosts} --tag {images}:{testname}" -+ sh____(cmd.format(**locals())) -+ cmd = "docker rm --force {testname}" -+ sx____(cmd.format(**locals())) -+ cmd = "docker run -d --name {testname} {images}:{testname} sleep 60" -+ sh____(cmd.format(**locals())) -+ #:# container = self.ip_container(testname) -+ cmd = "docker exec {testname} ls -l /usr/local/bin" -+ sh____(cmd.format(**locals())) -+ cmd = "docker exec {testname} find /usr/local/include -type f" -+ sh____(cmd.format(**locals())) -+ cmd = "docker exec {testname} bash -c 'ls -l /usr/local/lib64/libzz*'" -+ sh____(cmd.format(**locals())) -+ # -+ cmd = "docker exec {testname} bash -c 'test -d /usr/local/include/SDL_rwops_zzip'" -+ sh____(cmd.format(**locals())) -+ # -+ cmd = "docker rm --force {testname}" -+ sx____(cmd.format(**locals())) -+ cmd = "docker rmi {saveto}/{savename}:latest" -+ sx____(cmd.format(**locals())) -+ cmd = "docker tag {images}:{testname} {saveto}/{savename}:latest" -+ sh____(cmd.format(**locals())) -+ cmd = "docker rmi {images}:{testname}" -+ sx____(cmd.format(**locals())) -+ self.rm_testdir() - def test_701_centos7_am_docs_dockerfile(self): - if not os.path.exists(DOCKER_SOCKET): self.skipTest("docker-based test") - testname=self.testname() -@@ -1520,6 +1556,53 @@ class ZZiplibBuildTest(unittest.TestCase): - cmd = "docker rm --force {testname2}" - sx____(cmd.format(**locals())) - self.rm_testdir() -+ def test_9431_opensuse_ninja_sdl2_dockerfile(self): -+ if not os.path.exists(DOCKER_SOCKET): self.skipTest("docker-based test") -+ testname1=self.testname() + "_1" -+ testname2=self.testname() + "_2" -+ testdir = self.testdir() -+ dockerfile1="testbuilds/opensuse15-sdl2.dockerfile" -+ dockerfile2="testbuilds/opensuse15-ninja-sdl2.dockerfile" -+ addhosts = self.local_addhosts(dockerfile1) -+ savename1 = docname(dockerfile1) -+ savename2 = docname(dockerfile2) -+ saveto = SAVETO -+ images = IMAGES -+ cmd = "docker rm --force {testname1}" -+ sx____(cmd.format(**locals())) -+ cmd = "docker rm --force {testname2}" -+ sx____(cmd.format(**locals())) -+ cmd = "docker run -d --name {testname1} {addhosts} {saveto}/{savename1} sleep 600" -+ sh____(cmd.format(**locals())) -+ cmd = "docker run -d --name {testname2} {addhosts} {saveto}/{savename2} sleep 600" -+ # -+ sh____(cmd.format(**locals())) -+ cmd = "docker exec {testname2} bash -c 'cd /usr/local && tar czvf /local.tgz .'" -+ sh____(cmd.format(**locals())) -+ cmd = "docker cp {testname2}:/local.tgz tmp.local.tgz" -+ sh____(cmd.format(**locals())) -+ cmd = "docker cp tmp.local.tgz {testname1}:/local.tgz" -+ sh____(cmd.format(**locals())) -+ cmd = "rm tmp.local.tgz" -+ sh____(cmd.format(**locals())) -+ cmd = "docker exec {testname1} mkdir -p /new/local" -+ sh____(cmd.format(**locals())) -+ cmd = "docker exec {testname1} bash -c 'cd /new/local && tar xzvf /local.tgz'" -+ sh____(cmd.format(**locals())) -+ # -+ item="{}" -+ end="\\;" -+ cmd = "docker exec {testname1} diff -urw --no-dereference /usr/local /new/local" -+ sx____(cmd.format(**locals())) -+ out = output(cmd.format(**locals())) -+ self.assertFalse(greps(out, "---")) -+ self.assertFalse(greps(out, "Only")) -+ # -+ cmd = "docker rm --force {testname1}" -+ sx____(cmd.format(**locals())) -+ cmd = "docker rm --force {testname2}" -+ sx____(cmd.format(**locals())) -+ self.rm_testdir() - def test_9711_centos7_docs_dockerfile(self): - if not os.path.exists(DOCKER_SOCKET): self.skipTest("docker-based test") - testname1=self.testname() + "_1" -diff --git a/testbuilds/opensuse15-ninja-sdl2.dockerfile b/testbuilds/opensuse15-ninja-sdl2.dockerfile -new file mode 100644 -index 0000000..8a46dd4 ---- /dev/null -+++ b/testbuilds/opensuse15-ninja-sdl2.dockerfile -@@ -0,0 +1,24 @@ -+FROM opensuse/leap:15.1 -+ARG no_check=false -+ARG no_install=false -+# -DMAKE_INSTALL_PREFIX:PATH=/usr -+ -+RUN zypper refresh repo-oss -+RUN zypper install -r repo-oss -y gcc zlib-devel python3 cmake unzip zip gzip tar libSDL2-devel ninja -+ -+RUN mkdir src -+COPY CMakeLists.txt README COPYING.LIB ChangeLog src/ -+COPY CMakeScripts src/CMakeScripts -+COPY bins src/bins -+COPY docs src/docs -+COPY test src/test -+COPY SDL src/SDL -+COPY zzipwrap src/zzipwrap -+COPY zzip src/zzip -+ -+RUN mkdir src/build -+RUN cd src/build && cmake .. -GNinja -+RUN cd src/build && ninja -+RUN $no_check || (cd src/build && ninja check VERBOSE=1) -+RUN $no_install || (cd src/build && ninja install) -+ |