Skip to content
Snippets Groups Projects
Verified Commit c6bba336 authored by Mattia Rizzolo's avatar Mattia Rizzolo
Browse files

Also temporarily disable androguard and dexdump that are not available in testing


See: #1070416

Signed-off-by: Mattia Rizzolo's avatarMattia Rizzolo <mattia@debian.org>
parent cadfc73a
No related branches found
No related tags found
No related merge requests found
Pipeline #709675 passed
......@@ -10,7 +10,7 @@ Build-Depends:
7zip <!nocheck>,
# aapt <!nocheck>,
abootimg <!nocheck>,
androguard <!nocheck>,
# androguard <!nocheck>,
apksigcopier <!nocheck>,
apksigner <!nocheck>,
bash-completion,
......@@ -23,7 +23,7 @@ Build-Depends:
debhelper-compat (= 13),
default-jdk-headless <!nocheck> | default-jdk <!nocheck>,
device-tree-compiler (>= 1.4.2) <!nocheck>,
dexdump <!nocheck>,
# dexdump <!nocheck>,
dh-python (>= 2.20160818~),
docx2txt <!nocheck>,
dpkg-dev (>= 1.17.14),
......
......@@ -7,7 +7,7 @@
# $ mv debian/tests/control.tmp debian/tests/control
Tests: pytest-with-recommends
Depends: python3-all, diffoscope, black, python3-pytest, python3-h5py, file, linux-image-amd64 [amd64] | linux-image-generic [amd64], 7zip, abootimg, acl, apksigcopier, apksigner, apktool [!ppc64el !s390x], binutils-multiarch, bzip2, caca-utils, colord, coreboot-utils, db-util, default-jdk-headless | default-jdk | java-sdk, device-tree-compiler, dexdump [amd64 arm64 armhf i386], docx2txt, e2fsprogs, enjarify, ffmpeg, fontforge-extras, fonttools, fp-utils [!ppc64el !s390x], genisoimage, gettext, ghc, ghostscript, giflib-tools, gnumeric, gnupg-utils, gpg, hdf5-tools, html2text, imagemagick, jsbeautifier, libarchive-tools, libxmlb-utils, llvm, lz4, lzip, mono-utils, ocaml-nox, odt2txt, oggvideotools [!s390x], openssh-client, openssl, perl, pgpdump, poppler-utils, procyon-decompiler, python3-pdfminer, r-base-core, rpm2cpio, sng, sqlite3, squashfs-tools, tcpdump, u-boot-tools, unzip, wabt, xmlbeans, xxd, xz-utils, zip, zstd, androguard, python3-argcomplete, python3-binwalk, python3-defusedxml, python3-distro, python3-guestfs, python3-jsondiff, python3-progressbar, python3-pypdf, python3-debian, python3-pyxattr, python3-rpm, python3-tlsh
Depends: python3-all, diffoscope, black, python3-pytest, python3-h5py, file, linux-image-amd64 [amd64] | linux-image-generic [amd64], 7zip, abootimg, acl, apksigcopier, apksigner, apktool [!ppc64el !s390x], binutils-multiarch, bzip2, caca-utils, colord, coreboot-utils, db-util, default-jdk-headless | default-jdk | java-sdk, device-tree-compiler, docx2txt, e2fsprogs, enjarify, ffmpeg, fontforge-extras, fonttools, fp-utils [!ppc64el !s390x], genisoimage, gettext, ghc, ghostscript, giflib-tools, gnumeric, gnupg-utils, gpg, hdf5-tools, html2text, imagemagick, jsbeautifier, libarchive-tools, libxmlb-utils, llvm, lz4, lzip, mono-utils, ocaml-nox, odt2txt, oggvideotools [!s390x], openssh-client, openssl, perl, pgpdump, poppler-utils, procyon-decompiler, python3-pdfminer, r-base-core, rpm2cpio, sng, sqlite3, squashfs-tools, tcpdump, u-boot-tools, unzip, wabt, xmlbeans, xxd, xz-utils, zip, zstd, python3-argcomplete, python3-binwalk, python3-defusedxml, python3-distro, python3-guestfs, python3-jsondiff, python3-progressbar, python3-pypdf, python3-debian, python3-pyxattr, python3-rpm, python3-tlsh
Tests: pytest
Depends: python3-all, diffoscope, python3-pytest, python3-h5py, file, python3-tlsh
......
......@@ -22,8 +22,11 @@ sed -i "s,python3-rpm-python,python3-rpm," debian/tests/control.tmp
sed -i "s,apktool,apktool [!ppc64el !s390x]," debian/tests/control.tmp
sed -i "s,fp-utils,fp-utils [!ppc64el !s390x]," debian/tests/control.tmp
sed -i "s,oggvideotools,oggvideotools [!s390x]," debian/tests/control.tmp
sed -i "s,python3-androguard,androguard," debian/tests/control.tmp
sed -i "s,dexdump,dexdump [amd64 arm64 armhf i386]," debian/tests/control.tmp
#sed -i "s,python3-androguard,androguard," debian/tests/control.tmp
#sed -i "s,dexdump,dexdump [amd64 arm64 armhf i386]," debian/tests/control.tmp
# aapt removed due to not being in trixie atma - #1070416
# also remove androguard and dexdump for the same reason
#sed -i "s,aapt,aapt [amd64 arm64 armel armhf i386 mips64el mipsel]," debian/tests/control.tmp
sed -i "s#aapt, ##" debian/tests/control.tmp
sed -i "s#dexdump, ##" debian/tests/control.tmp
sed -i "s#python3-androguard, ##" debian/tests/control.tmp
......@@ -9,7 +9,7 @@ fi
export LIBGUESTFS_MEMSIZE=128
if [ "$(basename "$0")" = "pytest-with-recommends" ]; then
export DIFFOSCOPE_FAIL_TESTS_ON_MISSING_TOOLS="aapt2 apktool dexdump zipinfo pedump oggDump ppudump otool lipo radare2"
export DIFFOSCOPE_FAIL_TESTS_ON_MISSING_TOOLS="aapt2 androguard apktool dexdump zipinfo pedump oggDump ppudump otool lipo radare2"
fi
for py in $(py3versions -s); do
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment