[gnumeric] test: quiet biff8 test for chart markers.



commit f2874ff6e3b3b153f89031dab3f9a0f41086faa9
Author: Morten Welinder <terra gnome org>
Date:   Sat Jan 24 13:48:44 2015 -0500

    test: quiet biff8 test for chart markers.
    
    XL doesn't have all our marker types.

 test/t6516-graph.pl |   11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)
---
diff --git a/test/t6516-graph.pl b/test/t6516-graph.pl
index 426f3e3..404d84d 100755
--- a/test/t6516-graph.pl
+++ b/test/t6516-graph.pl
@@ -33,16 +33,19 @@ if (0) {
                     'filter2' => 'std:drop_codepage');
 }
 
+# Point size isn't important.
+my $xls_drop_pts_size = "$PERL -p -e '\$_ = \"\" if m{^\\s*<property 
name=\"(width|height)-pts\">[0-9.]+</property>\\s*}'";
+
+my $xls_missing_marker_shapes = "$PERL -p -e 
's/\\bshape=\"(hourglass|butterfly|lefthalf-bar)\"/shape=\"square\"/; 
s/\\bshape=\"triangle-(down|left|right)\"/shape=\"triangle-up\"/;'";
+
 &message ("Check graph xls/BIFF8 roundtrip.");
 &test_roundtrip ($file,
                 'format' => 'Gnumeric_Excel:excel_biff8',
                 'ext' => "xls",
+                'filter1' => "$xls_drop_pts_size | $xls_missing_marker_shapes",
                 'filter2' => 'std:drop_codepage',
                 'ignore_failure' => 1);
 
-# Point size isn't important.
-my $xlsx_drop_pts_size = "$PERL -p -e '\$_ = \"\" if m{^\\s*<property 
name=\"(width|height)-pts\">[0-9.]+</property>\\s*}'";
-
 my $xlsx_missing_marker_shapes = "$PERL -p -e 's/\\bshape=\"(hourglass|butterfly)\"/shape=\"diamond\"/;'";
 
 
@@ -51,5 +54,5 @@ my $xlsx_missing_marker_shapes = "$PERL -p -e 's/\\bshape=\"(hourglass|butterfly
                 'format' => 'Gnumeric_Excel:xlsx',
                 'ext' => "xlsx",
                 'resize' => '1048576x16384',
-                'filter1' => "$xlsx_drop_pts_size | $xlsx_missing_marker_shapes",
+                'filter1' => "$xls_drop_pts_size | $xlsx_missing_marker_shapes",
                 'ignore_failure' => 1);


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]