[Forensics-changes] [libewf] 06/07: Fix tests

[Hilko Bengen]

This is an automated email from the git hooks/post-receive script.

bengen pushed a commit to annotated tag debian/20160318-1
in repository libewf.

commit 15e8ac6bf13bdc0d2fb9d32caa89ed02dd4886de
Author: Hilko Bengen <bengen at debian.org>
Date:   Fri Mar 25 18:44:36 2016 +0100

    Fix tests
---
 debian/patches/Fix-tests.patch | 273 +++++++++++++++++++++++++++++++++++++++++
 debian/patches/series          |   1 +
 2 files changed, 274 insertions(+)

diff --git a/debian/patches/Fix-tests.patch b/debian/patches/Fix-tests.patch
new file mode 100644
index 0000000..890f6a8
--- /dev/null
+++ b/debian/patches/Fix-tests.patch
@@ -0,0 +1,273 @@
+Index: libewf/tests/test_ewfacquire.sh
+===================================================================
+--- libewf.orig/tests/test_ewfacquire.sh
++++ libewf/tests/test_ewfacquire.sh
+@@ -9,7 +9,7 @@ EXIT_IGNORE=77;
+ 
+ TEST_PREFIX=`pwd`;
+ TEST_PREFIX=`dirname ${TEST_PREFIX}`;
+-TEST_PREFIX=`basename ${TEST_PREFIX} | sed 's/^lib//'`;
++TEST_PREFIX=`basename ${TEST_PREFIX} | sed 's/^lib//' | sed 's/-201.*$//'`;
+ 
+ OPTION_SETS="format:encase1 format:encase2 format:encase3 format:encase4 format:encase5 format:encase6 format:encase7 format:encase7-v2 format:ewf format:ewfx format:ftk format:linen5 format:linen6 format:linen7 format:raw format:smart deflate:none:encase7 deflate:empty-block:encase7 deflate:fast:encase7 deflate:best:encase7 deflate:none:encase7-v2 deflate:empty-block:encase7-v2 deflate:fast:encase7-v2 deflate:best:encase7-v2 deflate:none:smart deflate:empty-block:smart deflate:fast:sma [...]
+ INPUT_GLOB="*.[Rr][Aa][Ww]";
+Index: libewf/tests/test_ewfacquire_device.sh
+===================================================================
+--- libewf.orig/tests/test_ewfacquire_device.sh
++++ libewf/tests/test_ewfacquire_device.sh
+@@ -9,7 +9,7 @@ EXIT_IGNORE=77;
+ 
+ TEST_PREFIX=`pwd`;
+ TEST_PREFIX=`dirname ${TEST_PREFIX}`;
+-TEST_PREFIX=`basename ${TEST_PREFIX} | sed 's/^lib//'`;
++TEST_PREFIX=`basename ${TEST_PREFIX} | sed 's/^lib//' | sed 's/-201.*$//'`;
+ 
+ run_test()
+ { 
+Index: libewf/tests/test_ewfacquire_optical.sh
+===================================================================
+--- libewf.orig/tests/test_ewfacquire_optical.sh
++++ libewf/tests/test_ewfacquire_optical.sh
+@@ -9,7 +9,7 @@ EXIT_IGNORE=77;
+ 
+ TEST_PREFIX=`pwd`;
+ TEST_PREFIX=`dirname ${TEST_PREFIX}`;
+-TEST_PREFIX=`basename ${TEST_PREFIX} | sed 's/^lib//'`;
++TEST_PREFIX=`basename ${TEST_PREFIX} | sed 's/^lib//' | sed 's/-201.*$//'`;
+ 
+ OPTION_SETS="format:encase5 format:encase6 format:encase7 format:encase7-v2";
+ INPUT_GLOB="*.[Cc][Uu][Ee]";
+Index: libewf/tests/test_ewfacquire_resume.sh
+===================================================================
+--- libewf.orig/tests/test_ewfacquire_resume.sh
++++ libewf/tests/test_ewfacquire_resume.sh
+@@ -9,7 +9,7 @@ EXIT_IGNORE=77;
+ 
+ TEST_PREFIX=`pwd`;
+ TEST_PREFIX=`dirname ${TEST_PREFIX}`;
+-TEST_PREFIX=`basename ${TEST_PREFIX} | sed 's/^lib//'`;
++TEST_PREFIX=`basename ${TEST_PREFIX} | sed 's/^lib//' | sed 's/-201.*$//'`;
+ 
+ test_write_resume()
+ { 
+Index: libewf/tests/test_ewfacquirestream.sh
+===================================================================
+--- libewf.orig/tests/test_ewfacquirestream.sh
++++ libewf/tests/test_ewfacquirestream.sh
+@@ -9,7 +9,7 @@ EXIT_IGNORE=77;
+ 
+ TEST_PREFIX=`pwd`;
+ TEST_PREFIX=`dirname ${TEST_PREFIX}`;
+-TEST_PREFIX=`basename ${TEST_PREFIX} | sed 's/^lib//'`;
++TEST_PREFIX=`basename ${TEST_PREFIX} | sed 's/^lib//' | sed 's/-201.*$//'`;
+ 
+ OPTION_SETS="format:encase1 format:encase2 format:encase3 format:encase4 format:encase5 format:encase6 format:encase7 format:encase7-v2 format:ewf format:ewfx format:ftk format:linen5 format:linen6 format:linen7 format:raw format:smart deflate:none:encase7 deflate:empty-block:encase7 deflate:fast:encase7 deflate:best:encase7 deflate:none:encase7-v2 deflate:empty-block:encase7-v2 deflate:fast:encase7-v2 deflate:best:encase7-v2 deflate:none:smart deflate:empty-block:smart deflate:fast:sma [...]
+ INPUT_GLOB="*.[Rr][Aa][Ww]";
+Index: libewf/tests/test_ewfexport.sh
+===================================================================
+--- libewf.orig/tests/test_ewfexport.sh
++++ libewf/tests/test_ewfexport.sh
+@@ -9,7 +9,7 @@ EXIT_IGNORE=77;
+ 
+ TEST_PREFIX=`pwd`;
+ TEST_PREFIX=`dirname ${TEST_PREFIX}`;
+-TEST_PREFIX=`basename ${TEST_PREFIX} | sed 's/^lib//'`;
++TEST_PREFIX=`basename ${TEST_PREFIX} | sed 's/^lib//' | sed 's/-201.*$//'`;
+ 
+ OPTION_SETS="format:encase1 format:encase2 format:encase3 format:encase4 format:encase5 format:encase6 format:encase7 format:encase7-v2 format:ewf format:ewfx format:ftk format:linen5 format:linen6 format:linen7 format:raw format:smart deflate:none deflate:empty-block deflate:fast deflate:best blocksize:16 blocksize:32 blocksize:128 blocksize:256 blocksize:512 blocksize:1024 blocksize:2048 blocksize:4096 blocksize:8192 blocksize:16384 blocksize:32768 hash:sha1 hash:sha256 hash:all";
+ INPUT_GLOB="*.[Ees]*01";
+Index: libewf/tests/test_ewfexport_logical.sh
+===================================================================
+--- libewf.orig/tests/test_ewfexport_logical.sh
++++ libewf/tests/test_ewfexport_logical.sh
+@@ -9,7 +9,7 @@ EXIT_IGNORE=77;
+ 
+ TEST_PREFIX=`pwd`;
+ TEST_PREFIX=`dirname ${TEST_PREFIX}`;
+-TEST_PREFIX=`basename ${TEST_PREFIX} | sed 's/^lib//'`;
++TEST_PREFIX=`basename ${TEST_PREFIX} | sed 's/^lib//' | sed 's/-201.*$//'`;
+ 
+ OPTION_SETS="";
+ INPUT_GLOB="*.[Ll]*01";
+Index: libewf/tests/test_ewfinfo.sh
+===================================================================
+--- libewf.orig/tests/test_ewfinfo.sh
++++ libewf/tests/test_ewfinfo.sh
+@@ -9,7 +9,7 @@ EXIT_IGNORE=77;
+ 
+ TEST_PREFIX=`pwd`;
+ TEST_PREFIX=`dirname ${TEST_PREFIX}`;
+-TEST_PREFIX=`basename ${TEST_PREFIX} | sed 's/^lib//'`;
++TEST_PREFIX=`basename ${TEST_PREFIX} | sed 's/^lib//' | sed 's/-201.*$//'`;
+ 
+ OPTION_SETS="";
+ INPUT_GLOB="*.[ELels]*01";
+Index: libewf/tests/test_ewfverify.sh
+===================================================================
+--- libewf.orig/tests/test_ewfverify.sh
++++ libewf/tests/test_ewfverify.sh
+@@ -9,7 +9,7 @@ EXIT_IGNORE=77;
+ 
+ TEST_PREFIX=`pwd`;
+ TEST_PREFIX=`dirname ${TEST_PREFIX}`;
+-TEST_PREFIX=`basename ${TEST_PREFIX} | sed 's/^lib//'`;
++TEST_PREFIX=`basename ${TEST_PREFIX} | sed 's/^lib//' | sed 's/-201.*$//'`;
+ 
+ OPTION_SETS="";
+ INPUT_GLOB="*.[Ees]*01";
+Index: libewf/tests/test_ewfverify_logical.sh
+===================================================================
+--- libewf.orig/tests/test_ewfverify_logical.sh
++++ libewf/tests/test_ewfverify_logical.sh
+@@ -9,7 +9,7 @@ EXIT_IGNORE=77;
+ 
+ TEST_PREFIX=`pwd`;
+ TEST_PREFIX=`dirname ${TEST_PREFIX}`;
+-TEST_PREFIX=`basename ${TEST_PREFIX} | sed 's/^lib//'`;
++TEST_PREFIX=`basename ${TEST_PREFIX} | sed 's/^lib//' | sed 's/-201.*$//'`;
+ 
+ OPTION_SETS="";
+ INPUT_GLOB="*.[Ll]*01";
+Index: libewf/tests/test_glob.sh
+===================================================================
+--- libewf.orig/tests/test_glob.sh
++++ libewf/tests/test_glob.sh
+@@ -9,7 +9,7 @@ EXIT_IGNORE=77;
+ 
+ TEST_PREFIX=`pwd`;
+ TEST_PREFIX=`dirname ${TEST_PREFIX}`;
+-TEST_PREFIX=`basename ${TEST_PREFIX} | sed 's/^lib//'`;
++TEST_PREFIX=`basename ${TEST_PREFIX} | sed 's/^lib//' | sed 's/-201.*$//'`;
+ 
+ TEST_EXECUTABLE="${TEST_PREFIX}_test_glob";
+ 
+Index: libewf/tests/test_open_close.sh
+===================================================================
+--- libewf.orig/tests/test_open_close.sh
++++ libewf/tests/test_open_close.sh
+@@ -9,7 +9,7 @@ EXIT_IGNORE=77;
+ 
+ TEST_PREFIX=`pwd`;
+ TEST_PREFIX=`dirname ${TEST_PREFIX}`;
+-TEST_PREFIX=`basename ${TEST_PREFIX} | sed 's/^lib//'`;
++TEST_PREFIX=`basename ${TEST_PREFIX} | sed 's/^lib//' | sed 's/-201.*$//'`;
+ 
+ OPTION_SETS="";
+ INPUT_GLOB="*.[ELels]*01";
+Index: libewf/tests/test_pyewf_open_close.sh
+===================================================================
+--- libewf.orig/tests/test_pyewf_open_close.sh
++++ libewf/tests/test_pyewf_open_close.sh
+@@ -9,7 +9,7 @@ EXIT_IGNORE=77;
+ 
+ TEST_PREFIX=`pwd`;
+ TEST_PREFIX=`dirname ${TEST_PREFIX}`;
+-TEST_PREFIX=`basename ${TEST_PREFIX} | sed 's/^lib//'`;
++TEST_PREFIX=`basename ${TEST_PREFIX} | sed 's/^lib//' | sed 's/-201.*$//'`;
+ 
+ TEST_SCRIPT="py${TEST_PREFIX}_test_open_close.py";
+ OPTION_SETS="";
+Index: libewf/tests/test_pyewf_read.sh
+===================================================================
+--- libewf.orig/tests/test_pyewf_read.sh
++++ libewf/tests/test_pyewf_read.sh
+@@ -9,7 +9,7 @@ EXIT_IGNORE=77;
+ 
+ TEST_PREFIX=`pwd`;
+ TEST_PREFIX=`dirname ${TEST_PREFIX}`;
+-TEST_PREFIX=`basename ${TEST_PREFIX} | sed 's/^lib//'`;
++TEST_PREFIX=`basename ${TEST_PREFIX} | sed 's/^lib//' | sed 's/-201.*$//'`;
+ 
+ TEST_SCRIPT="py${TEST_PREFIX}_test_read.py";
+ OPTION_SETS="";
+Index: libewf/tests/test_pyewf_seek.sh
+===================================================================
+--- libewf.orig/tests/test_pyewf_seek.sh
++++ libewf/tests/test_pyewf_seek.sh
+@@ -9,7 +9,7 @@ EXIT_IGNORE=77;
+ 
+ TEST_PREFIX=`pwd`;
+ TEST_PREFIX=`dirname ${TEST_PREFIX}`;
+-TEST_PREFIX=`basename ${TEST_PREFIX} | sed 's/^lib//'`;
++TEST_PREFIX=`basename ${TEST_PREFIX} | sed 's/^lib//' | sed 's/-201.*$//'`;
+ 
+ TEST_SCRIPT="py${TEST_PREFIX}_test_seek.py";
+ OPTION_SETS="";
+Index: libewf/tests/test_read.sh
+===================================================================
+--- libewf.orig/tests/test_read.sh
++++ libewf/tests/test_read.sh
+@@ -9,7 +9,7 @@ EXIT_IGNORE=77;
+ 
+ TEST_PREFIX=`pwd`;
+ TEST_PREFIX=`dirname ${TEST_PREFIX}`;
+-TEST_PREFIX=`basename ${TEST_PREFIX} | sed 's/^lib//'`;
++TEST_PREFIX=`basename ${TEST_PREFIX} | sed 's/^lib//' | sed 's/-201.*$//'`;
+ 
+ TEST_EXECUTABLE="${TEST_PREFIX}_test_read";
+ OPTION_SETS="";
+Index: libewf/tests/test_read_chunk.sh
+===================================================================
+--- libewf.orig/tests/test_read_chunk.sh
++++ libewf/tests/test_read_chunk.sh
+@@ -9,7 +9,7 @@ EXIT_IGNORE=77;
+ 
+ TEST_PREFIX=`pwd`;
+ TEST_PREFIX=`dirname ${TEST_PREFIX}`;
+-TEST_PREFIX=`basename ${TEST_PREFIX} | sed 's/^lib//'`;
++TEST_PREFIX=`basename ${TEST_PREFIX} | sed 's/^lib//' | sed 's/-201.*$//'`;
+ 
+ TEST_EXECUTABLE="${TEST_PREFIX}_test_read_chunk";
+ OPTION_SETS="";
+Index: libewf/tests/test_runner.sh
+===================================================================
+--- libewf.orig/tests/test_runner.sh
++++ libewf/tests/test_runner.sh
+@@ -58,7 +58,7 @@ then
+ 	then
+ 		LIBRARY=`dirname ${EXECUTABLE} | sed 's?.*/\(.*\)tools$?lib\1?'`;
+ 	else
+-		LIBRARY=`basename ${EXECUTABLE} | sed 's/^\(.*\)_test_.*$/lib\1/'`;
++		LIBRARY=`basename ${EXECUTABLE} | sed 's/^\(.*\)_test_.*$/lib\1/' | sed 's/-201.*$//'`;
+ 	fi
+ 
+ 	if test $? -eq 0;
+Index: libewf/tests/test_seek.sh
+===================================================================
+--- libewf.orig/tests/test_seek.sh
++++ libewf/tests/test_seek.sh
+@@ -9,7 +9,7 @@ EXIT_IGNORE=77;
+ 
+ TEST_PREFIX=`pwd`;
+ TEST_PREFIX=`dirname ${TEST_PREFIX}`;
+-TEST_PREFIX=`basename ${TEST_PREFIX} | sed 's/^lib//'`;
++TEST_PREFIX=`basename ${TEST_PREFIX} | sed 's/^lib//' | sed 's/-201.*$//'`;
+ 
+ TEST_EXECUTABLE="${TEST_PREFIX}_test_seek";
+ OPTION_SETS="";
+Index: libewf/tests/test_write.sh
+===================================================================
+--- libewf.orig/tests/test_write.sh
++++ libewf/tests/test_write.sh
+@@ -9,7 +9,7 @@ EXIT_IGNORE=77;
+ 
+ TEST_PREFIX=`pwd`;
+ TEST_PREFIX=`dirname ${TEST_PREFIX}`;
+-TEST_PREFIX=`basename ${TEST_PREFIX} | sed 's/^lib//'`;
++TEST_PREFIX=`basename ${TEST_PREFIX} | sed 's/^lib//' | sed 's/-201.*$//'`;
+ 
+ TEST_EXECUTABLE="${TEST_PREFIX}_test_write";
+ 
+Index: libewf/tests/test_write_chunk.sh
+===================================================================
+--- libewf.orig/tests/test_write_chunk.sh
++++ libewf/tests/test_write_chunk.sh
+@@ -9,7 +9,7 @@ EXIT_IGNORE=77;
+ 
+ TEST_PREFIX=`pwd`;
+ TEST_PREFIX=`dirname ${TEST_PREFIX}`;
+-TEST_PREFIX=`basename ${TEST_PREFIX} | sed 's/^lib//'`;
++TEST_PREFIX=`basename ${TEST_PREFIX} | sed 's/^lib//' | sed 's/-201.*$//'`;
+ 
+ TEST_EXECUTABLE="${TEST_PREFIX}_test_write_chunk";
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 4555d93..a4de37c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 03-fix-FTBFS-hurd-386.patch
+Fix-tests.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/forensics/libewf.git