Merge 7b3f37a into 1a3ff37

flux-framework · Jun 21, 2018 · 98287c0 · 98287c0
2 parents 1a3ff37 + 7b3f37a
commit 98287c0
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/common/libsubprocess/subprocess.c b/src/common/libsubprocess/subprocess.c
@@ -169,7 +169,7 @@ static int subprocess_run_hooks (struct subprocess *p, zlist_t *hooks)
 
 /*
  *  Default handler for stdout/err: send output directly into
- *   stderr of caller...
+ *   stdout/err of caller...
  */
 static int send_output_to_stream (const char *name, const char *json_str)
 {

diff --git a/src/common/libsubprocess/test/subprocess.c b/src/common/libsubprocess/test/subprocess.c
@@ -189,7 +189,7 @@ int main (int ac, char **av)
     is (subprocess_state_string (p), "Waiting", "subprocess is Waiting");
     ok (subprocess_pid (p) > 0, "subprocess_pid() is valid");
 
-    ok (subprocess_exec (p) == 0, "subprocess_run");
+    ok (subprocess_exec (p) == 0, "subprocess_exec");
     is (subprocess_state_string (p), "Running", "subprocess is Running");
     q = subprocess_manager_wait (sm);
     ok (q != NULL, "subprocess_manager_wait");