diff options
| author | Kevin Krakauer <krakauer@google.com> | 2020-01-24 10:42:43 -0800 |
|---|---|---|
| committer | Kevin Krakauer <krakauer@google.com> | 2020-01-24 10:42:43 -0800 |
| commit | 7636478a316692328097c9e70d38ff878539afb3 (patch) | |
| tree | 637787744e7f6a10bb4a5acb926447d451cb500f /test/util/multiprocess_util.h | |
| parent | b7853f688b4bcd3465c0c3087fcbd8d53bdf26ae (diff) | |
| parent | 3db317390b5cc491d680fc4a5fc7b8372890b4da (diff) | |
Merge branch 'master' into ipt-udp-matchers
Diffstat (limited to 'test/util/multiprocess_util.h')
| -rw-r--r-- | test/util/multiprocess_util.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/test/util/multiprocess_util.h b/test/util/multiprocess_util.h index 61526b4e7..3e736261b 100644 --- a/test/util/multiprocess_util.h +++ b/test/util/multiprocess_util.h @@ -103,7 +103,8 @@ inline PosixErrorOr<Cleanup> ForkAndExec(const std::string& filename, } // Equivalent to ForkAndExec, except using dirfd and flags with execveat. -PosixErrorOr<Cleanup> ForkAndExecveat(int32_t dirfd, const std::string& pathname, +PosixErrorOr<Cleanup> ForkAndExecveat(int32_t dirfd, + const std::string& pathname, const ExecveArray& argv, const ExecveArray& envv, int flags, const std::function<void()>& fn, |