[libgsf] tests: distcheck fixes.
- From: Morten Welinder <mortenw src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [libgsf] tests: distcheck fixes.
- Date: Wed, 4 Feb 2015 23:37:02 +0000 (UTC)
commit 8f80c993366f8948a57c51326b30a990bba5009f
Author: Morten Welinder <terra gnome org>
Date: Wed Feb 4 18:36:50 2015 -0500
tests: distcheck fixes.
tests/t1000-zip-single.pl | 2 +-
tests/t1001-zip-multiple.pl | 6 +++++-
tests/t1004-zip-zip64.pl | 8 ++++++--
tests/t1005-zip-nonseekable.pl | 10 +++++++---
tests/t8000-valgrind-zip.pl | 6 +++++-
tests/t8020-valgrind-ole.pl | 6 +++++-
tests/t8040-valgrind-tar.pl | 6 +++++-
7 files changed, 34 insertions(+), 10 deletions(-)
---
diff --git a/tests/t1000-zip-single.pl b/tests/t1000-zip-single.pl
index 4dbe142..200007f 100755
--- a/tests/t1000-zip-single.pl
+++ b/tests/t1000-zip-single.pl
@@ -5,5 +5,5 @@ use strict;
use lib ($0 =~ m|^(.*/)| ? $1 : ".");
use LibGsfTest;
-&test_zip ('files' => ['Makefile.am'],
+&test_zip ('files' => ["Makefile"],
'zip-member-tests' => ['!zip64']);
diff --git a/tests/t1001-zip-multiple.pl b/tests/t1001-zip-multiple.pl
index 469fb44..42f483c 100755
--- a/tests/t1001-zip-multiple.pl
+++ b/tests/t1001-zip-multiple.pl
@@ -5,5 +5,9 @@ use strict;
use lib ($0 =~ m|^(.*/)| ? $1 : ".");
use LibGsfTest;
-&test_zip ('files' => ['Makefile.am', 'common.supp'],
+my $NEWS = 'NEWS';
+&LibGsfTest::junkfile ($NEWS);
+system ("cp", "$topsrc/NEWS", $NEWS);
+
+&test_zip ('files' => ['Makefile', $NEWS],
'zip-member-tests' => ['!zip64']);
diff --git a/tests/t1004-zip-zip64.pl b/tests/t1004-zip-zip64.pl
index f4af552..8b368c6 100755
--- a/tests/t1004-zip-zip64.pl
+++ b/tests/t1004-zip-zip64.pl
@@ -5,10 +5,14 @@ use strict;
use lib ($0 =~ m|^(.*/)| ? $1 : ".");
use LibGsfTest;
-&test_zip ('files' => ['Makefile.am', 'common.supp'],
+my $NEWS = 'NEWS';
+&LibGsfTest::junkfile ($NEWS);
+system ("cp", "$topsrc/NEWS", $NEWS);
+
+&test_zip ('files' => ['Makefile', $NEWS],
'create-options' => ["--zip64=1"],
'zip-member-tests' => ['zip64', '!ignore']);
-&test_zip ('files' => ['Makefile.am', 'common.supp'],
+&test_zip ('files' => ['Makefile', $NEWS],
'create-options' => ["--zip64=0"],
'zip-member-tests' => ['!zip64', '!ignore']);
diff --git a/tests/t1005-zip-nonseekable.pl b/tests/t1005-zip-nonseekable.pl
index 6c0a9d5..fe27bf7 100755
--- a/tests/t1005-zip-nonseekable.pl
+++ b/tests/t1005-zip-nonseekable.pl
@@ -5,16 +5,20 @@ use strict;
use lib ($0 =~ m|^(.*/)| ? $1 : ".");
use LibGsfTest;
-&test_zip ('files' => ['Makefile.am', 'common.supp'],
+my $NEWS = 'NEWS';
+&LibGsfTest::junkfile ($NEWS);
+system ("cp", "$topsrc/NEWS", $NEWS);
+
+&test_zip ('files' => ['Makefile', $NEWS],
'stdio' => 1,
'zip-member-tests' => ['zip64']);
-&test_zip ('files' => ['Makefile.am', 'common.supp'],
+&test_zip ('files' => ['Makefile', $NEWS],
'create-options' => ["--zip64=0"],
'stdio' => 1,
'zip-member-tests' => ['!zip64']);
-&test_zip ('files' => ['Makefile.am', 'common.supp'],
+&test_zip ('files' => ['Makefile', $NEWS],
'create-options' => ["--zip64=1"],
'stdio' => 1,
'zip-member-tests' => ['zip64']);
diff --git a/tests/t8000-valgrind-zip.pl b/tests/t8000-valgrind-zip.pl
index 7b91dcf..ad7597c 100755
--- a/tests/t8000-valgrind-zip.pl
+++ b/tests/t8000-valgrind-zip.pl
@@ -8,7 +8,11 @@ use LibGsfTest;
my $archive = "test.zip";
&LibGsfTest::junkfile ($archive);
-my @files = ('Makefile.am', 'common.supp');
+my $NEWS = 'NEWS';
+&LibGsfTest::junkfile ($NEWS);
+system ("cp", "$topsrc/NEWS", $NEWS);
+
+my @files = ('Makefile', $NEWS);
print STDERR "Testing zip create\n";
&test_valgrind ("$gsf createzip $archive @files", 1);
diff --git a/tests/t8020-valgrind-ole.pl b/tests/t8020-valgrind-ole.pl
index e33151a..d6df5d7 100755
--- a/tests/t8020-valgrind-ole.pl
+++ b/tests/t8020-valgrind-ole.pl
@@ -8,7 +8,11 @@ use LibGsfTest;
my $archive = "test.ole";
&LibGsfTest::junkfile ($archive);
-my @files = ('Makefile.am', 'common.supp');
+my $NEWS = 'NEWS';
+&LibGsfTest::junkfile ($NEWS);
+system ("cp", "$topsrc/NEWS", $NEWS);
+
+my @files = ('Makefile', $NEWS);
print STDERR "Testing ole create\n";
&test_valgrind ("$gsf createole $archive @files", 1);
diff --git a/tests/t8040-valgrind-tar.pl b/tests/t8040-valgrind-tar.pl
index 2a7501b..bd7c55d 100755
--- a/tests/t8040-valgrind-tar.pl
+++ b/tests/t8040-valgrind-tar.pl
@@ -8,7 +8,11 @@ use LibGsfTest;
my $archive = "test.tar";
&LibGsfTest::junkfile ($archive);
-my @files = ('Makefile.am', 'common.supp');
+my $NEWS = 'NEWS';
+&LibGsfTest::junkfile ($NEWS);
+system ("cp", "$topsrc/NEWS", $NEWS);
+
+my @files = ('Makefile', $NEWS);
if (0) {
print STDERR "Testing tar write\n";
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]