From 51b49c31eb932880f98d3e50c8a0039db80b14f7 Mon Sep 17 00:00:00 2001 From: Michal Privoznik Date: Sat, 9 Dec 2023 07:19:19 +0100 Subject: tests: Drop unused formatters test files In 5901b5b5b2e13b2a0e14f7c047c9c8142a7493a4 test_formatters.py was made to test libvirt-go-module and libvirt-go-xml-module against debian-12. New expected output files were introduced, but the old ones were never removed. Signed-off-by: Michal Privoznik --- ...virt-go-debian-10-common-cross-s390x.Dockerfile | 49 ---------------------- .../libvirt-go-debian-10-cross-s390x.Dockerfile | 49 ---------------------- .../out/libvirt-go-debian-10-cross-s390x.json | 25 ----------- .../out/libvirt-go-debian-10-cross-s390x.sh | 43 ------------------- .../out/libvirt-go-debian-10-cross-s390x.vars | 13 ------ .../formatters/out/libvirt-go-debian-10.Dockerfile | 26 ------------ .../data/formatters/out/libvirt-go-debian-10.json | 21 ---------- tests/data/formatters/out/libvirt-go-debian-10.sh | 23 ---------- .../data/formatters/out/libvirt-go-debian-10.vars | 10 ----- .../out/libvirt-go-xml-module-debian-10.Dockerfile | 18 -------- .../out/libvirt-go-xml-module-debian-10.json | 17 -------- .../out/libvirt-go-xml-module-debian-10.sh | 15 ------- .../out/libvirt-go-xml-module-debian-10.vars | 10 ----- 13 files changed, 319 deletions(-) delete mode 100644 tests/data/formatters/out/libvirt-go-debian-10-common-cross-s390x.Dockerfile delete mode 100644 tests/data/formatters/out/libvirt-go-debian-10-cross-s390x.Dockerfile delete mode 100644 tests/data/formatters/out/libvirt-go-debian-10-cross-s390x.json delete mode 100644 tests/data/formatters/out/libvirt-go-debian-10-cross-s390x.sh delete mode 100644 tests/data/formatters/out/libvirt-go-debian-10-cross-s390x.vars delete mode 100644 tests/data/formatters/out/libvirt-go-debian-10.Dockerfile delete mode 100644 tests/data/formatters/out/libvirt-go-debian-10.json delete mode 100644 tests/data/formatters/out/libvirt-go-debian-10.sh delete mode 100644 tests/data/formatters/out/libvirt-go-debian-10.vars delete mode 100644 tests/data/formatters/out/libvirt-go-xml-module-debian-10.Dockerfile delete mode 100644 tests/data/formatters/out/libvirt-go-xml-module-debian-10.json delete mode 100644 tests/data/formatters/out/libvirt-go-xml-module-debian-10.sh delete mode 100644 tests/data/formatters/out/libvirt-go-xml-module-debian-10.vars diff --git a/tests/data/formatters/out/libvirt-go-debian-10-common-cross-s390x.Dockerfile b/tests/data/formatters/out/libvirt-go-debian-10-common-cross-s390x.Dockerfile deleted file mode 100644 index 8f81f3f..0000000 --- a/tests/data/formatters/out/libvirt-go-debian-10-common-cross-s390x.Dockerfile +++ /dev/null @@ -1,49 +0,0 @@ -FROM debian-10-common - -RUN export DEBIAN_FRONTEND=noninteractive && \ - apt-get update && \ - apt-get install -y eatmydata && \ - eatmydata apt-get dist-upgrade -y && \ - eatmydata apt-get install --no-install-recommends -y \ - ca-certificates \ - ccache \ - git \ - golang \ - locales \ - pkgconf && \ - eatmydata apt-get autoremove -y && \ - eatmydata apt-get autoclean -y && \ - sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ - dpkg-reconfigure locales - -ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" -ENV LANG "en_US.UTF-8" - -RUN export DEBIAN_FRONTEND=noninteractive && \ - dpkg --add-architecture s390x && \ - eatmydata apt-get update && \ - eatmydata apt-get dist-upgrade -y && \ - eatmydata apt-get install --no-install-recommends -y dpkg-dev && \ - eatmydata apt-get install --no-install-recommends -y \ - gcc-s390x-linux-gnu \ - libc6-dev:s390x && \ - eatmydata apt-get autoremove -y && \ - eatmydata apt-get autoclean -y && \ - mkdir -p /usr/local/share/meson/cross && \ - printf "[binaries]\n\ -c = '/usr/bin/s390x-linux-gnu-gcc'\n\ -ar = '/usr/bin/s390x-linux-gnu-gcc-ar'\n\ -strip = '/usr/bin/s390x-linux-gnu-strip'\n\ -pkgconfig = '/usr/bin/s390x-linux-gnu-pkg-config'\n\ -\n\ -[host_machine]\n\ -system = 'linux'\n\ -cpu_family = 's390x'\n\ -cpu = 's390x'\n\ -endian = 'big'\n" > /usr/local/share/meson/cross/s390x-linux-gnu && \ - dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt && \ - mkdir -p /usr/libexec/ccache-wrappers && \ - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/s390x-linux-gnu-cc && \ - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/s390x-linux-gnu-gcc - -ENV ABI "s390x-linux-gnu" \ No newline at end of file diff --git a/tests/data/formatters/out/libvirt-go-debian-10-cross-s390x.Dockerfile b/tests/data/formatters/out/libvirt-go-debian-10-cross-s390x.Dockerfile deleted file mode 100644 index bc71d5a..0000000 --- a/tests/data/formatters/out/libvirt-go-debian-10-cross-s390x.Dockerfile +++ /dev/null @@ -1,49 +0,0 @@ -FROM docker.io/library/debian:10-slim - -RUN export DEBIAN_FRONTEND=noninteractive && \ - apt-get update && \ - apt-get install -y eatmydata && \ - eatmydata apt-get dist-upgrade -y && \ - eatmydata apt-get install --no-install-recommends -y \ - ca-certificates \ - ccache \ - git \ - golang \ - locales \ - pkgconf && \ - eatmydata apt-get autoremove -y && \ - eatmydata apt-get autoclean -y && \ - sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ - dpkg-reconfigure locales - -ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" -ENV LANG "en_US.UTF-8" - -RUN export DEBIAN_FRONTEND=noninteractive && \ - dpkg --add-architecture s390x && \ - eatmydata apt-get update && \ - eatmydata apt-get dist-upgrade -y && \ - eatmydata apt-get install --no-install-recommends -y dpkg-dev && \ - eatmydata apt-get install --no-install-recommends -y \ - gcc-s390x-linux-gnu \ - libc6-dev:s390x && \ - eatmydata apt-get autoremove -y && \ - eatmydata apt-get autoclean -y && \ - mkdir -p /usr/local/share/meson/cross && \ - printf "[binaries]\n\ -c = '/usr/bin/s390x-linux-gnu-gcc'\n\ -ar = '/usr/bin/s390x-linux-gnu-gcc-ar'\n\ -strip = '/usr/bin/s390x-linux-gnu-strip'\n\ -pkgconfig = '/usr/bin/s390x-linux-gnu-pkg-config'\n\ -\n\ -[host_machine]\n\ -system = 'linux'\n\ -cpu_family = 's390x'\n\ -cpu = 's390x'\n\ -endian = 'big'\n" > /usr/local/share/meson/cross/s390x-linux-gnu && \ - dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt && \ - mkdir -p /usr/libexec/ccache-wrappers && \ - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/s390x-linux-gnu-cc && \ - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/s390x-linux-gnu-gcc - -ENV ABI "s390x-linux-gnu" \ No newline at end of file diff --git a/tests/data/formatters/out/libvirt-go-debian-10-cross-s390x.json b/tests/data/formatters/out/libvirt-go-debian-10-cross-s390x.json deleted file mode 100644 index b4c9fb3..0000000 --- a/tests/data/formatters/out/libvirt-go-debian-10-cross-s390x.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "ccache": "/usr/bin/ccache", - "cpan_pkgs": [], - "cross_abi": "s390x-linux-gnu", - "cross_arch": "s390x", - "cross_arch_deb": "s390x", - "cross_pkgs": [ - "gcc-s390x-linux-gnu", - "libc6-dev:s390x" - ], - "make": "/usr/bin/make", - "ninja": "/usr/bin/ninja", - "packaging_command": "apt-get", - "pip3": "/usr/bin/pip3", - "pkgs": [ - "ca-certificates", - "ccache", - "git", - "golang", - "locales", - "pkgconf" - ], - "pypi_pkgs": [], - "python": "/usr/bin/python3" -} \ No newline at end of file diff --git a/tests/data/formatters/out/libvirt-go-debian-10-cross-s390x.sh b/tests/data/formatters/out/libvirt-go-debian-10-cross-s390x.sh deleted file mode 100644 index 8d6e215..0000000 --- a/tests/data/formatters/out/libvirt-go-debian-10-cross-s390x.sh +++ /dev/null @@ -1,43 +0,0 @@ -function install_buildenv() { - export DEBIAN_FRONTEND=noninteractive - apt-get update - apt-get dist-upgrade -y - apt-get install --no-install-recommends -y \ - ca-certificates \ - ccache \ - git \ - golang \ - locales \ - pkgconf - sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen - dpkg-reconfigure locales - export DEBIAN_FRONTEND=noninteractive - dpkg --add-architecture s390x - apt-get update - apt-get dist-upgrade -y - apt-get install --no-install-recommends -y dpkg-dev - apt-get install --no-install-recommends -y \ - gcc-s390x-linux-gnu \ - libc6-dev:s390x - mkdir -p /usr/local/share/meson/cross - printf "[binaries]\n\ -c = '/usr/bin/s390x-linux-gnu-gcc'\n\ -ar = '/usr/bin/s390x-linux-gnu-gcc-ar'\n\ -strip = '/usr/bin/s390x-linux-gnu-strip'\n\ -pkgconfig = '/usr/bin/s390x-linux-gnu-pkg-config'\n\ -\n\ -[host_machine]\n\ -system = 'linux'\n\ -cpu_family = 's390x'\n\ -cpu = 's390x'\n\ -endian = 'big'\n" > /usr/local/share/meson/cross/s390x-linux-gnu - dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt - mkdir -p /usr/libexec/ccache-wrappers - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/s390x-linux-gnu-cc - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/s390x-linux-gnu-gcc -} - -export CCACHE_WRAPPERSDIR="/usr/libexec/ccache-wrappers" -export LANG="en_US.UTF-8" - -export ABI="s390x-linux-gnu" \ No newline at end of file diff --git a/tests/data/formatters/out/libvirt-go-debian-10-cross-s390x.vars b/tests/data/formatters/out/libvirt-go-debian-10-cross-s390x.vars deleted file mode 100644 index eaf080a..0000000 --- a/tests/data/formatters/out/libvirt-go-debian-10-cross-s390x.vars +++ /dev/null @@ -1,13 +0,0 @@ -CCACHE='/usr/bin/ccache' -CPAN_PKGS='' -CROSS_ABI='s390x-linux-gnu' -CROSS_ARCH='s390x' -CROSS_ARCH_DEB='s390x' -CROSS_PKGS='gcc-s390x-linux-gnu libc6-dev:s390x' -MAKE='/usr/bin/make' -NINJA='/usr/bin/ninja' -PACKAGING_COMMAND='apt-get' -PIP3='/usr/bin/pip3' -PKGS='ca-certificates ccache git golang locales pkgconf' -PYPI_PKGS='' -PYTHON='/usr/bin/python3' \ No newline at end of file diff --git a/tests/data/formatters/out/libvirt-go-debian-10.Dockerfile b/tests/data/formatters/out/libvirt-go-debian-10.Dockerfile deleted file mode 100644 index 2652429..0000000 --- a/tests/data/formatters/out/libvirt-go-debian-10.Dockerfile +++ /dev/null @@ -1,26 +0,0 @@ -FROM docker.io/library/debian:10-slim - -RUN export DEBIAN_FRONTEND=noninteractive && \ - apt-get update && \ - apt-get install -y eatmydata && \ - eatmydata apt-get dist-upgrade -y && \ - eatmydata apt-get install --no-install-recommends -y \ - ca-certificates \ - ccache \ - gcc \ - git \ - golang \ - libc6-dev \ - locales \ - pkgconf && \ - eatmydata apt-get autoremove -y && \ - eatmydata apt-get autoclean -y && \ - sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ - dpkg-reconfigure locales && \ - dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt && \ - mkdir -p /usr/libexec/ccache-wrappers && \ - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \ - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc - -ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" -ENV LANG "en_US.UTF-8" \ No newline at end of file diff --git a/tests/data/formatters/out/libvirt-go-debian-10.json b/tests/data/formatters/out/libvirt-go-debian-10.json deleted file mode 100644 index df430ab..0000000 --- a/tests/data/formatters/out/libvirt-go-debian-10.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "ccache": "/usr/bin/ccache", - "cpan_pkgs": [], - "cross_pkgs": [], - "make": "/usr/bin/make", - "ninja": "/usr/bin/ninja", - "packaging_command": "apt-get", - "pip3": "/usr/bin/pip3", - "pkgs": [ - "ca-certificates", - "ccache", - "gcc", - "git", - "golang", - "libc6-dev", - "locales", - "pkgconf" - ], - "pypi_pkgs": [], - "python": "/usr/bin/python3" -} \ No newline at end of file diff --git a/tests/data/formatters/out/libvirt-go-debian-10.sh b/tests/data/formatters/out/libvirt-go-debian-10.sh deleted file mode 100644 index 1119d98..0000000 --- a/tests/data/formatters/out/libvirt-go-debian-10.sh +++ /dev/null @@ -1,23 +0,0 @@ -function install_buildenv() { - export DEBIAN_FRONTEND=noninteractive - apt-get update - apt-get dist-upgrade -y - apt-get install --no-install-recommends -y \ - ca-certificates \ - ccache \ - gcc \ - git \ - golang \ - libc6-dev \ - locales \ - pkgconf - sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen - dpkg-reconfigure locales - dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt - mkdir -p /usr/libexec/ccache-wrappers - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc -} - -export CCACHE_WRAPPERSDIR="/usr/libexec/ccache-wrappers" -export LANG="en_US.UTF-8" \ No newline at end of file diff --git a/tests/data/formatters/out/libvirt-go-debian-10.vars b/tests/data/formatters/out/libvirt-go-debian-10.vars deleted file mode 100644 index 9de94d7..0000000 --- a/tests/data/formatters/out/libvirt-go-debian-10.vars +++ /dev/null @@ -1,10 +0,0 @@ -CCACHE='/usr/bin/ccache' -CPAN_PKGS='' -CROSS_PKGS='' -MAKE='/usr/bin/make' -NINJA='/usr/bin/ninja' -PACKAGING_COMMAND='apt-get' -PIP3='/usr/bin/pip3' -PKGS='ca-certificates ccache gcc git golang libc6-dev locales pkgconf' -PYPI_PKGS='' -PYTHON='/usr/bin/python3' \ No newline at end of file diff --git a/tests/data/formatters/out/libvirt-go-xml-module-debian-10.Dockerfile b/tests/data/formatters/out/libvirt-go-xml-module-debian-10.Dockerfile deleted file mode 100644 index 9950814..0000000 --- a/tests/data/formatters/out/libvirt-go-xml-module-debian-10.Dockerfile +++ /dev/null @@ -1,18 +0,0 @@ -FROM docker.io/library/debian:10-slim - -RUN export DEBIAN_FRONTEND=noninteractive && \ - apt-get update && \ - apt-get install -y eatmydata && \ - eatmydata apt-get dist-upgrade -y && \ - eatmydata apt-get install --no-install-recommends -y \ - ca-certificates \ - git \ - golang \ - locales && \ - eatmydata apt-get autoremove -y && \ - eatmydata apt-get autoclean -y && \ - sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ - dpkg-reconfigure locales && \ - dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt - -ENV LANG "en_US.UTF-8" \ No newline at end of file diff --git a/tests/data/formatters/out/libvirt-go-xml-module-debian-10.json b/tests/data/formatters/out/libvirt-go-xml-module-debian-10.json deleted file mode 100644 index c674f20..0000000 --- a/tests/data/formatters/out/libvirt-go-xml-module-debian-10.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "ccache": "/usr/bin/ccache", - "cpan_pkgs": [], - "cross_pkgs": [], - "make": "/usr/bin/make", - "ninja": "/usr/bin/ninja", - "packaging_command": "apt-get", - "pip3": "/usr/bin/pip3", - "pkgs": [ - "ca-certificates", - "git", - "golang", - "locales" - ], - "pypi_pkgs": [], - "python": "/usr/bin/python3" -} \ No newline at end of file diff --git a/tests/data/formatters/out/libvirt-go-xml-module-debian-10.sh b/tests/data/formatters/out/libvirt-go-xml-module-debian-10.sh deleted file mode 100644 index 2c61b5d..0000000 --- a/tests/data/formatters/out/libvirt-go-xml-module-debian-10.sh +++ /dev/null @@ -1,15 +0,0 @@ -function install_buildenv() { - export DEBIAN_FRONTEND=noninteractive - apt-get update - apt-get dist-upgrade -y - apt-get install --no-install-recommends -y \ - ca-certificates \ - git \ - golang \ - locales - sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen - dpkg-reconfigure locales - dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt -} - -export LANG="en_US.UTF-8" \ No newline at end of file diff --git a/tests/data/formatters/out/libvirt-go-xml-module-debian-10.vars b/tests/data/formatters/out/libvirt-go-xml-module-debian-10.vars deleted file mode 100644 index 7b1147c..0000000 --- a/tests/data/formatters/out/libvirt-go-xml-module-debian-10.vars +++ /dev/null @@ -1,10 +0,0 @@ -CCACHE='/usr/bin/ccache' -CPAN_PKGS='' -CROSS_PKGS='' -MAKE='/usr/bin/make' -NINJA='/usr/bin/ninja' -PACKAGING_COMMAND='apt-get' -PIP3='/usr/bin/pip3' -PKGS='ca-certificates git golang locales' -PYPI_PKGS='' -PYTHON='/usr/bin/python3' \ No newline at end of file -- cgit v1.1