[gnumeric] t6515: time to turn xlsx back on

[Morten Welinder <mortenw src gnome org>]

commit 73456eb71cfc17ead9b045fb806ab3aeedb8993c
Author: Morten Welinder <terra gnome org>
Date:   Wed Mar 19 13:46:11 2014 -0400

    t6515: time to turn xlsx back on

 test/t6515-cond-format.pl |   11 +++--------
 1 files changed, 3 insertions(+), 8 deletions(-)
---
diff --git a/test/t6515-cond-format.pl b/test/t6515-cond-format.pl
index 65bdaa9..971c2be 100755
--- a/test/t6515-cond-format.pl
+++ b/test/t6515-cond-format.pl
@@ -16,8 +16,7 @@ my $file = "$samples/cond-format-tests.gnumeric";
 &test_roundtrip ($file,
                 'format' => 'Gnumeric_OpenCalc:odf',
                 'ext' => "ods",
-                'filter2' => "$PERL -p -e '\$_ = \"\" if m{<meta:generator>}'",
-                'ignore_failure' => 1);
+                'filter2' => "$PERL -p -e '\$_ = \"\" if m{<meta:generator>}'");
 
 my $xls_codepage_filter = "$PERL -p -e '\$_ = \"\" if m{<meta:user-defined meta:name=.msole:codepage.}'";
 
@@ -30,22 +29,18 @@ my $xls_cond_format_filter = "$PERL -p -e 'if (m{<gnm:Condition\\b} ... m{</gnm:
                 'ext' => "xls",
                 'resize' => '16384x256',
                 # 'filter1' => $xls_cond_format_filter,
-                'filter2' => $xls_codepage_filter,
-                'ignore_failure' => 1);
+                'filter2' => $xls_codepage_filter);
 
 &message ("Check conditional format xls/BIFF8 roundtrip.");
 &test_roundtrip ($file,
                 'format' => 'Gnumeric_Excel:excel_biff8',
                 'ext' => "xls",
                 '# filter1' => $xls_cond_format_filter,
-                'filter2' => $xls_codepage_filter,
-                'ignore_failure' => 1);
+                'filter2' => $xls_codepage_filter);
 
-if (0) {
 &message ("Check conditional format xlsx roundtrip.");
 &test_roundtrip ($file,
                 'format' => 'Gnumeric_Excel:xlsx',
                 'ext' => "xlsx",
                 'resize' => '1048576x16384',
                 'ignore_failure' => 1);
-}