[Forensics-changes] [SCM] debian-forensics/afflib branch, debian, updated. debian/3.5.7+dfsg-1-3-g9246198
Christophe Monniez
christophe.monniez at fccu.be
Tue Feb 23 21:02:12 UTC 2010
The following commit has been merged in the debian branch:
commit 9246198670b3fbde6fed9ecdaa5ce3d9f208054e
Author: Christophe Monniez <christophe.monniez at fccu.be>
Date: Tue Feb 23 22:01:47 2010 +0100
Adding the previously mentioned patch file.
diff --git a/debian/patches/04-tests-disabling b/debian/patches/04-tests-disabling
new file mode 100644
index 0000000..38e71f5
--- /dev/null
+++ b/debian/patches/04-tests-disabling
@@ -0,0 +1,303 @@
+Index: afflib/Makefile.am
+===================================================================
+--- afflib.orig/Makefile.am 2010-02-23 21:51:10.524222519 +0100
++++ afflib/Makefile.am 2010-02-23 21:51:10.548223302 +0100
+@@ -1,4 +1,4 @@
+-SUBDIRS = lib tools lzma443 tests doc pyaff man
++SUBDIRS = lib tools lzma443 doc pyaff man
+
+ pkgconfigdir = $(libdir)/pkgconfig
+
+@@ -106,8 +106,6 @@
+ afflib.pc.in \
+ afflib.pubkey.asc \
+ misc/expat-2.0.1.tar.gz \
+- tests/encrypted.iso \
+- tests/encrypted.aff
+
+ #
+ # Note: don't forget to run autoreconf when significant changes are made
+Index: afflib/Makefile.in
+===================================================================
+--- afflib.orig/Makefile.in 2010-02-23 21:51:10.524222519 +0100
++++ afflib/Makefile.in 2010-02-23 21:51:10.548223302 +0100
+@@ -229,7 +229,7 @@
+ target_alias = @target_alias@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+-SUBDIRS = lib tools lzma443 tests doc pyaff man
++SUBDIRS = lib tools lzma443 doc pyaff man
+ pkgconfigdir = $(libdir)/pkgconfig
+ pkgconfig_DATA = afflib.pc
+ include_HEADERS =
+@@ -297,8 +297,6 @@
+ afflib.pc.in \
+ afflib.pubkey.asc \
+ misc/expat-2.0.1.tar.gz \
+- tests/encrypted.iso \
+- tests/encrypted.aff
+
+ all: affconfig.h
+ $(MAKE) $(AM_MAKEFLAGS) all-recursive
+Index: afflib/configure
+===================================================================
+--- afflib.orig/configure 2010-02-23 21:51:10.532215749 +0100
++++ afflib/configure 2010-02-23 21:51:10.552240869 +0100
+@@ -11831,7 +11831,7 @@
+
+ # AC_PROG_RANLIB not needed if you are using AC_PROG_LIBTOOL
+ # AC_PROG_RANLIB
+-ac_config_files="$ac_config_files Makefile lib/Makefile tools/Makefile lzma443/Makefile tests/Makefile doc/Makefile pyaff/Makefile man/Makefile lib/version.h"
++ac_config_files="$ac_config_files Makefile lib/Makefile tools/Makefile lzma443/Makefile doc/Makefile pyaff/Makefile man/Makefile lib/version.h"
+
+ ac_config_files="$ac_config_files afflib.spec"
+
+@@ -23224,7 +23224,6 @@
+ "lib/Makefile") CONFIG_FILES="$CONFIG_FILES lib/Makefile" ;;
+ "tools/Makefile") CONFIG_FILES="$CONFIG_FILES tools/Makefile" ;;
+ "lzma443/Makefile") CONFIG_FILES="$CONFIG_FILES lzma443/Makefile" ;;
+- "tests/Makefile") CONFIG_FILES="$CONFIG_FILES tests/Makefile" ;;
+ "doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;;
+ "pyaff/Makefile") CONFIG_FILES="$CONFIG_FILES pyaff/Makefile" ;;
+ "man/Makefile") CONFIG_FILES="$CONFIG_FILES man/Makefile" ;;
+Index: afflib/configure.ac
+===================================================================
+--- afflib.orig/configure.ac 2010-02-23 21:51:10.532215749 +0100
++++ afflib/configure.ac 2010-02-23 21:51:10.552240869 +0100
+@@ -31,7 +31,7 @@
+ # AC_PROG_RANLIB not needed if you are using AC_PROG_LIBTOOL
+ # AC_PROG_RANLIB
+ AC_CONFIG_FILES([Makefile lib/Makefile tools/Makefile lzma443/Makefile
+- tests/Makefile doc/Makefile pyaff/Makefile man/Makefile lib/version.h])
++ doc/Makefile pyaff/Makefile man/Makefile lib/version.h])
+ dnl Have configure make distribution specific files
+ AC_CONFIG_FILES([afflib.spec])
+ dnl Have configure write its configuration
+Index: afflib/lib/Makefile.in
+===================================================================
+--- afflib.orig/lib/Makefile.in 2010-02-23 21:48:11.016216858 +0100
++++ afflib/lib/Makefile.in 2010-02-23 21:51:10.552240869 +0100
+@@ -873,79 +873,6 @@
+ distclean-tags:
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+-check-TESTS: $(TESTS)
+- @failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[ ]'; \
+- srcdir=$(srcdir); export srcdir; \
+- list=' $(TESTS) '; \
+- if test -n "$$list"; then \
+- for tst in $$list; do \
+- if test -f ./$$tst; then dir=./; \
+- elif test -f $$tst; then dir=; \
+- else dir="$(srcdir)/"; fi; \
+- if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
+- all=`expr $$all + 1`; \
+- case " $(XFAIL_TESTS) " in \
+- *$$ws$$tst$$ws*) \
+- xpass=`expr $$xpass + 1`; \
+- failed=`expr $$failed + 1`; \
+- echo "XPASS: $$tst"; \
+- ;; \
+- *) \
+- echo "PASS: $$tst"; \
+- ;; \
+- esac; \
+- elif test $$? -ne 77; then \
+- all=`expr $$all + 1`; \
+- case " $(XFAIL_TESTS) " in \
+- *$$ws$$tst$$ws*) \
+- xfail=`expr $$xfail + 1`; \
+- echo "XFAIL: $$tst"; \
+- ;; \
+- *) \
+- failed=`expr $$failed + 1`; \
+- echo "FAIL: $$tst"; \
+- ;; \
+- esac; \
+- else \
+- skip=`expr $$skip + 1`; \
+- echo "SKIP: $$tst"; \
+- fi; \
+- done; \
+- if test "$$failed" -eq 0; then \
+- if test "$$xfail" -eq 0; then \
+- banner="All $$all tests passed"; \
+- else \
+- banner="All $$all tests behaved as expected ($$xfail expected failures)"; \
+- fi; \
+- else \
+- if test "$$xpass" -eq 0; then \
+- banner="$$failed of $$all tests failed"; \
+- else \
+- banner="$$failed of $$all tests did not behave as expected ($$xpass unexpected passes)"; \
+- fi; \
+- fi; \
+- dashes="$$banner"; \
+- skipped=""; \
+- if test "$$skip" -ne 0; then \
+- skipped="($$skip tests were not run)"; \
+- test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \
+- dashes="$$skipped"; \
+- fi; \
+- report=""; \
+- if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \
+- report="Please report to $(PACKAGE_BUGREPORT)"; \
+- test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \
+- dashes="$$report"; \
+- fi; \
+- dashes=`echo "$$dashes" | sed s/./=/g`; \
+- echo "$$dashes"; \
+- echo "$$banner"; \
+- test -z "$$skipped" || echo "$$skipped"; \
+- test -z "$$report" || echo "$$report"; \
+- echo "$$dashes"; \
+- test "$$failed" -eq 0; \
+- else :; fi
+-
+ distdir: $(DISTFILES)
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+@@ -973,7 +900,6 @@
+ fi; \
+ done
+ check-am: all-am
+- $(MAKE) $(AM_MAKEFLAGS) check-TESTS
+ check: check-am
+ all-am: Makefile $(LTLIBRARIES) $(PROGRAMS)
+ install-binPROGRAMS: install-libLTLIBRARIES
+@@ -1069,7 +995,7 @@
+
+ .MAKE: install-am install-exec-am install-strip
+
+-.PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \
++.PHONY: CTAGS GTAGS all all-am check check-am clean \
+ clean-binPROGRAMS clean-generic clean-libLTLIBRARIES \
+ clean-libtool ctags distclean distclean-compile \
+ distclean-generic distclean-libtool distclean-tags distdir dvi \
+Index: afflib/tools/Makefile.am
+===================================================================
+--- afflib.orig/tools/Makefile.am 2010-02-23 21:51:18.368217821 +0100
++++ afflib/tools/Makefile.am 2010-02-23 21:51:48.436230391 +0100
+@@ -1,10 +1,6 @@
+ bin_PROGRAMS = afcat afcompare afconvert afcopy afcrypto affix afinfo afsegment \
+ afstats afverify afxml affuse afrecover afsign afdiskprint
+
+-EXTRA_DIST = test_make_random_iso.sh test_crypto.sh test_signing.sh test_recovery.sh \
+- test_passphrase.sh test_afsegment.sh
+-
+-TESTS = test_signing.sh test_recovery.sh test_passphrase.sh test_afsegment.sh test_crypto.sh
+
+ # See http://www.gnu.org/software/libtool/manual.html # Using-Automake
+
+Index: afflib/tools/Makefile.in
+===================================================================
+--- afflib.orig/tools/Makefile.in 2010-02-23 21:52:28.917222293 +0100
++++ afflib/tools/Makefile.in 2010-02-23 21:53:09.456478311 +0100
+@@ -283,10 +283,6 @@
+ target_alias = @target_alias@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+-EXTRA_DIST = test_make_random_iso.sh test_crypto.sh test_signing.sh test_recovery.sh \
+- test_passphrase.sh test_afsegment.sh
+-
+-TESTS = test_signing.sh test_recovery.sh test_passphrase.sh test_afsegment.sh test_crypto.sh
+
+ # See http://www.gnu.org/software/libtool/manual.html # Using-Automake
+ AM_LDFLAGS = -static # staticly link our tools (easier debugging)
+@@ -553,79 +549,6 @@
+ distclean-tags:
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+-check-TESTS: $(TESTS)
+- @failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[ ]'; \
+- srcdir=$(srcdir); export srcdir; \
+- list=' $(TESTS) '; \
+- if test -n "$$list"; then \
+- for tst in $$list; do \
+- if test -f ./$$tst; then dir=./; \
+- elif test -f $$tst; then dir=; \
+- else dir="$(srcdir)/"; fi; \
+- if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
+- all=`expr $$all + 1`; \
+- case " $(XFAIL_TESTS) " in \
+- *$$ws$$tst$$ws*) \
+- xpass=`expr $$xpass + 1`; \
+- failed=`expr $$failed + 1`; \
+- echo "XPASS: $$tst"; \
+- ;; \
+- *) \
+- echo "PASS: $$tst"; \
+- ;; \
+- esac; \
+- elif test $$? -ne 77; then \
+- all=`expr $$all + 1`; \
+- case " $(XFAIL_TESTS) " in \
+- *$$ws$$tst$$ws*) \
+- xfail=`expr $$xfail + 1`; \
+- echo "XFAIL: $$tst"; \
+- ;; \
+- *) \
+- failed=`expr $$failed + 1`; \
+- echo "FAIL: $$tst"; \
+- ;; \
+- esac; \
+- else \
+- skip=`expr $$skip + 1`; \
+- echo "SKIP: $$tst"; \
+- fi; \
+- done; \
+- if test "$$failed" -eq 0; then \
+- if test "$$xfail" -eq 0; then \
+- banner="All $$all tests passed"; \
+- else \
+- banner="All $$all tests behaved as expected ($$xfail expected failures)"; \
+- fi; \
+- else \
+- if test "$$xpass" -eq 0; then \
+- banner="$$failed of $$all tests failed"; \
+- else \
+- banner="$$failed of $$all tests did not behave as expected ($$xpass unexpected passes)"; \
+- fi; \
+- fi; \
+- dashes="$$banner"; \
+- skipped=""; \
+- if test "$$skip" -ne 0; then \
+- skipped="($$skip tests were not run)"; \
+- test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \
+- dashes="$$skipped"; \
+- fi; \
+- report=""; \
+- if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \
+- report="Please report to $(PACKAGE_BUGREPORT)"; \
+- test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \
+- dashes="$$report"; \
+- fi; \
+- dashes=`echo "$$dashes" | sed s/./=/g`; \
+- echo "$$dashes"; \
+- echo "$$banner"; \
+- test -z "$$skipped" || echo "$$skipped"; \
+- test -z "$$report" || echo "$$report"; \
+- echo "$$dashes"; \
+- test "$$failed" -eq 0; \
+- else :; fi
+-
+ distdir: $(DISTFILES)
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+@@ -653,7 +576,6 @@
+ fi; \
+ done
+ check-am: all-am
+- $(MAKE) $(AM_MAKEFLAGS) check-TESTS
+ check: check-am
+ all-am: Makefile $(PROGRAMS)
+ installdirs:
+@@ -745,7 +667,7 @@
+
+ .MAKE: install-am install-strip
+
+-.PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \
++.PHONY: CTAGS GTAGS all all-am check check-am clean \
+ clean-binPROGRAMS clean-generic clean-libtool ctags distclean \
+ distclean-compile distclean-generic distclean-libtool \
+ distclean-tags distdir dvi dvi-am html html-am info info-am \
--
debian-forensics/afflib
More information about the forensics-changes
mailing list