debian: reinstate oggvideotools and procyon-decompiler test dependencies, now...

debian: reinstate oggvideotools and procyon-decompiler test dependencies, now that are not buggy anymore
Signed-off-by: Mattia Rizzolo's avatarMattia Rizzolo <mattia@debian.org>
parent c022b028
...@@ -79,9 +79,7 @@ override_dh_auto_clean: ...@@ -79,9 +79,7 @@ override_dh_auto_clean:
@sed -i "s,python3-rpm-python,python3-rpm," debian/tests/control.tmp @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,apktool,apktool [!ppc64el !s390x]," debian/tests/control.tmp
@sed -i "s,fp-utils,fp-utils [!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,oggvideotools,oggvideotools [!s390x]," debian/tests/control.tmp
@sed -i "s/oggvideotools, //" debian/tests/control.tmp
@sed -i "s/procyon-decompiler, //" debian/tests/control.tmp
@set -e ; if ! diff -q debian/tests/control debian/tests/control.tmp ; then \ @set -e ; if ! diff -q debian/tests/control debian/tests/control.tmp ; then \
echo ;\ echo ;\
echo "The generated control file differs from the actual one." ;\ echo "The generated control file differs from the actual one." ;\
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
# $ mv debian/tests/control.tmp debian/tests/control # $ mv debian/tests/control.tmp debian/tests/control
Tests: pytest-with-recommends Tests: pytest-with-recommends
Depends: diffoscope, black, python3-pytest, file, linux-image-amd64 [amd64] | linux-image-generic [amd64], abootimg, acl, apktool [!ppc64el !s390x], binutils-multiarch, bzip2, caca-utils, colord, db-util, default-jdk-headless | default-jdk | java-sdk, device-tree-compiler, docx2txt, e2fsprogs, enjarify, ffmpeg, fontforge-extras, fp-utils [!ppc64el !s390x], genisoimage, gettext, ghc, ghostscript, giflib-tools, gnumeric, gnupg, gnupg-utils, imagemagick, jsbeautifier, libarchive-tools, llvm, lz4 | liblz4-tool, mono-utils, ocaml-nox, odt2txt, openssh-client, pgpdump, poppler-utils, r-base-core, rpm2cpio, sng, sqlite3, squashfs-tools, tcpdump, unzip, xmlbeans, xxd | vim-common, xz-utils, zip, python3-argcomplete, python3-binwalk, python3-defusedxml, python3-distro, python3-guestfs, python3-jsondiff, python3-progressbar, python3-pypdf2, python3-debian, python3-pyxattr, python3-rpm, python3-tlsh Depends: diffoscope, black, python3-pytest, file, linux-image-amd64 [amd64] | linux-image-generic [amd64], abootimg, acl, apktool [!ppc64el !s390x], binutils-multiarch, bzip2, caca-utils, colord, db-util, default-jdk-headless | default-jdk | java-sdk, device-tree-compiler, docx2txt, e2fsprogs, enjarify, ffmpeg, fontforge-extras, fp-utils [!ppc64el !s390x], genisoimage, gettext, ghc, ghostscript, giflib-tools, gnumeric, gnupg, gnupg-utils, imagemagick, jsbeautifier, libarchive-tools, llvm, lz4 | liblz4-tool, mono-utils, ocaml-nox, odt2txt, oggvideotools [!s390x], openssh-client, pgpdump, poppler-utils, procyon-decompiler, r-base-core, rpm2cpio, sng, sqlite3, squashfs-tools, tcpdump, unzip, xmlbeans, xxd | vim-common, xz-utils, zip, python3-argcomplete, python3-binwalk, python3-defusedxml, python3-distro, python3-guestfs, python3-jsondiff, python3-progressbar, python3-pypdf2, python3-debian, python3-pyxattr, python3-rpm, python3-tlsh
Tests: pytest Tests: pytest
Depends: diffoscope, python3-pytest, file Depends: diffoscope, python3-pytest, file
......
...@@ -10,7 +10,7 @@ fi ...@@ -10,7 +10,7 @@ fi
export LIBGUESTFS_MEMSIZE=128 export LIBGUESTFS_MEMSIZE=128
if [ "$(basename "$0")" = "pytest-with-recommends" ]; then if [ "$(basename "$0")" = "pytest-with-recommends" ]; then
export DIFFOSCOPE_TESTS_FAIL_ON_MISSING_TOOLS=1 export DIFFOSCOPE_TESTS_FAIL_ON_MISSING_TOOLS=1
export DIFFOSCOPE_TESTS_MISSING_TOOLS="cbfstool procyon otool lipo oggDump wasm2wat" export DIFFOSCOPE_TESTS_MISSING_TOOLS="cbfstool otool lipo wasm2wat"
fi fi
cp -r tests "$ADTTMP" cp -r tests "$ADTTMP"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment