From 822059e4e69547f8e97a1cd219912f55826b0414 Mon Sep 17 00:00:00 2001
From: Karen Arutyunov <karen@codesynthesis.com>
Date: Thu, 27 Jul 2017 18:00:16 +0300
Subject: Rename process_start() and process_run() overloads

---
 tests/process-run/driver.cxx | 16 ++++++++--------
 tests/progress/driver.cxx    | 10 +++++++---
 2 files changed, 15 insertions(+), 11 deletions(-)

(limited to 'tests')

diff --git a/tests/process-run/driver.cxx b/tests/process-run/driver.cxx
index ff9dd25..695fdb9 100644
--- a/tests/process-run/driver.cxx
+++ b/tests/process-run/driver.cxx
@@ -65,14 +65,14 @@ main (int argc, const char* argv[])
   assert (run (0, 1, 2, p));
   assert (run (0, 1, 2, p, "-c"));
 
-  process_run ([] (const char* c[], size_t n)
-               {
-                 process::print (cout, c, n);
-                 cout << endl;
-               },
-               0, 1, 2,
-               p,
-               "-c");
+  process_run_callback ([] (const char* c[], size_t n)
+                        {
+                          process::print (cout, c, n);
+                          cout << endl;
+                        },
+                        0, 1, 2,
+                        p,
+                        "-c");
 
   // Stream conversion and redirection.
   //
diff --git a/tests/progress/driver.cxx b/tests/progress/driver.cxx
index 64e84fd..791e485 100644
--- a/tests/progress/driver.cxx
+++ b/tests/progress/driver.cxx
@@ -70,10 +70,14 @@ main (int argc, const char* argv[])
     auto print = [] (const string& s)
     {
 #ifndef _WIN32
-      write (stderr_fd(), s.c_str (), s.size ());
+      ssize_t r (write (stderr_fd(), s.c_str (), s.size ()));
 #else
-      _write (stderr_fd(), s.c_str (), static_cast<unsigned int> (s.size ()));
+      int r (_write (stderr_fd(),
+                     s.c_str (),
+                     static_cast<unsigned int> (s.size ())));
 #endif
+
+      assert (r != -1);
     };
 
     for (size_t i (50); i != 0; --i)
@@ -89,7 +93,7 @@ main (int argc, const char* argv[])
   //    warns about calls ambiguity).
   //
   process pr (!no_child
-              ? process_start (fdnull (), fdnull (), stderr_fd (),
+              ? process_start (fdnull (), fdnull (), 2,
                                process_env (argv[0]), "-c")
               : process (process_exit (0))); // Exited normally.
 
-- 
cgit v1.1