3 files changed, 10 insertions, 13 deletions

diff --git a/xdelta3/testing/regtest.cc b/xdelta3/testing/regtest.cc
index be6309a..d31f6b5 100644
--- a/xdelta3/testing/regtest.cc
+++ b/xdelta3/testing/regtest.cc
@@ -108,10 +108,7 @@ void InMemoryEncodeDecode(const FileSpec &source_file,
       ret = xd3_decode_input(&decode_stream);
       msg = decode_stream.msg;
     }
-
-    IF_DEBUG1(XPR(NTR "%s = %s %s\n", encoding ? "E " : " D",
-                 xd3_strerror(ret),
-                 msg == NULL ? "" : msg));
+    (void) msg;
 
     switch (ret) {
     case XD3_OUTPUT:
@@ -193,6 +190,10 @@ void InMemoryEncodeDecode(const FileSpec &source_file,
       goto process;
 
     default:
+      XPR(NTR "%s = %s %s\n", encoding ? "E " : " D",
+          xd3_strerror(ret),
+          msg == NULL ? "" : msg);
+
       CHECK_EQ(0, ret);
       CHECK_EQ(-1, ret);
     }
diff --git a/xdelta3/testing/test.h b/xdelta3/testing/test.h
index f7c2ced..d1f1a22 100644
--- a/xdelta3/testing/test.h
+++ b/xdelta3/testing/test.h
@@ -5,6 +5,7 @@ extern "C" {
 #include "../xdelta3-internal.h"
 }
 
+#include <unistd.h>
 #include <math.h>
 #include <string>
 
diff --git a/xdelta3/xdelta3-test.h b/xdelta3/xdelta3-test.h
index 7464c4f..3c5446b 100644
--- a/xdelta3/xdelta3-test.h
+++ b/xdelta3/xdelta3-test.h
@@ -178,7 +178,7 @@ static int do_fail (xd3_stream *stream, const char *buf)
   if (! WIFEXITED (ret) || WEXITSTATUS (ret) != 1)
     {
       stream->msg = "command should have not succeeded";
-      XPR(NT "command was %s", buf);
+      XPR(NT "command was %s\n", buf);
       return XD3_INTERNAL;
     }
   return 0;
@@ -218,15 +218,10 @@ test_random_numbers (xd3_stream *stream, int ignore)
 static void
 test_unlink (char* file)
 {
-  char buf[TESTBUFSIZE];
-  while (unlink (file) != 0)
+  int ret;
+  if ((ret = unlink (file)) != 0 && errno != ENOENT)
     {
-      if (errno == ENOENT)
-        {
-          break;
-        }
-      snprintf_func (buf, sizeof(buf), "rm -f %s", file);
-      system (buf);
+      XPR(NT "unlink %s failed: %s\n", file, strerror(ret));
     }
 }