From: Martin Matuska <martin@matuska.org>
Date: Thu, 13 Oct 2016 10:36:00 +0000 (+0200)
Subject: Redirect and verify stderr in test_read_append_filter_wrong_program
X-Git-Tag: v3.2.2~9^2~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e3bdbbf3475c3abf264e563c753a20972095665e;p=thirdparty%2Flibarchive.git

Redirect and verify stderr in test_read_append_filter_wrong_program
---

diff --git a/libarchive/test/test_read_set_format.c b/libarchive/test/test_read_set_format.c
index f9be97835..d333269c2 100644
--- a/libarchive/test/test_read_set_format.c
+++ b/libarchive/test/test_read_set_format.c
@@ -200,6 +200,8 @@ DEFINE_TEST(test_read_append_filter_wrong_program)
 {
   struct archive_entry *ae;
   struct archive *a;
+  int fd;
+  fpos_t pos;
 
   /*
    * If we have "bunzip2 -q", try using that.
@@ -208,6 +210,13 @@ DEFINE_TEST(test_read_append_filter_wrong_program)
     skipping("Can't run bunzip2 program on this platform");
     return;
   }
+
+  /* bunzip2 will write to stderr, redirect it to a file */
+  fflush(stderr);
+  fgetpos(stderr, &pos);
+  fd = dup(fileno(stderr));
+  freopen("stderr1", "w", stderr);
+
   assert((a = archive_read_new()) != NULL);
   assertA(0 == archive_read_set_format(a, ARCHIVE_FORMAT_TAR));
   assertEqualIntA(a, ARCHIVE_OK,
@@ -217,4 +226,13 @@ DEFINE_TEST(test_read_append_filter_wrong_program)
   assertA(archive_read_next_header(a, &ae) < (ARCHIVE_WARN));
   assertEqualIntA(a, ARCHIVE_WARN, archive_read_close(a));
   assertEqualInt(ARCHIVE_OK, archive_read_free(a));
+
+  /* restore stderr */
+  fflush(stderr);
+  dup2(fd, fileno(stderr));
+  close(fd);
+  clearerr(stderr);
+  fsetpos(stderr, &pos);
+
+  assertTextFileContents("bunzip2: (stdin) is not a bzip2 file.\n", "stderr1");
 }