From eeb520bf3950f9e97e18e20e671bb97b513133db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= <dan.cermak@cgc-instruments.com>
Date: Thu, 11 Oct 2018 18:01:38 +0200
Subject: [PATCH] [testsuite] Add reproducer for second bug from #159

The bug described in the issue got resolved by PR #461 (slices).
---
 test/data/printStructure2               | Bin 0 -> 12357 bytes
 tests/bugfixes/github/test_issue_159.py |  50 ++++++------------------
 2 files changed, 13 insertions(+), 37 deletions(-)
 create mode 100644 test/data/printStructure2

diff --git a/test/data/printStructure2 b/test/data/printStructure2
new file mode 100644
index 0000000000000000000000000000000000000000..97ee450eb6b9d43b2aa48ff80e8879e31fc27782
GIT binary patch
literal 12357
zcmeIuyA6df3<Xg0d4gG}vIcW8)?1DMLb#zoR7fX9bPL;Y&OA>sMns8H`g+&2pYBC&
z>x^?w&QIs(`d`{7=es@gyEzYOx4YgZ)m***rKvjGzs|oMQf>kS2oNAZfB*pk1PBly
rK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBly@DYI(zjOBZ

literal 0
HcmV?d00001

diff --git a/tests/bugfixes/github/test_issue_159.py b/tests/bugfixes/github/test_issue_159.py
index 72532550..ad9615bc 100644
--- a/tests/bugfixes/github/test_issue_159.py
+++ b/tests/bugfixes/github/test_issue_159.py
@@ -5,47 +5,23 @@ import system_tests
 
 class TestFirstPoC(metaclass=system_tests.CaseMeta):
     """
-    Regression test for the first bug described in:
+    Regression test for the two bugs described in:
     https://github.com/Exiv2/exiv2/issues/159
+
+    We do not actually check the output of these files, we only check that we
+    don't get a crash (the metadata are bogus anyway, so no point in checking).
     """
     url = "https://github.com/Exiv2/exiv2/issues/159"
 
-    filename = "$data_path/printStructure"
-    commands = ["$exiv2 " + filename]
-    stdout = [
-        """File name       : $filename
-File size       : 12357 Bytes
-MIME type       : image/tiff
-Image size      : 0 x 0
-Camera make     : 
-Camera model    : 
-Image timestamp : 
-Image number    : 
-Exposure time   : 
-Aperture        : 
-Exposure bias   : 
-Flash           : 
-Flash bias      : 
-Focal length    : 
-Subject distance: 
-ISO speed       : 
-Exposure mode   : 
-Metering mode   : 
-Macro mode      : 
-Image quality   : 
-Exif Resolution : 
-White balance   : 
-Thumbnail       : None
-Copyright       : 
-Exif comment    : 
-
-"""
+    filename = [
+        system_tests.path("$data_path/printStructure"),
+        system_tests.path("$data_path/printStructure2")
     ]
-    stderr = [""]
-    retval = [0]
+    commands = [
+        "$exiv2 " + filename[0],
+        "$exiv2 -pS " + filename[1],
+    ]
+    retval = [0, 1]
 
     compare_stderr = system_tests.check_no_ASAN_UBSAN_errors
-
-
-# todo:
-# class TestSecondPoC(system_tests.Case):
+    compare_stdout = system_tests.check_no_ASAN_UBSAN_errors