2
0
mirror of https://github.com/boostorg/process.git synced 2026-01-19 04:22:15 +00:00

fix v1 tests after v2 became the default

As of 2ccd97cd48, v2 is the default when using the unversioned includes.
This broke the v1 tests which were still using those.
This commit is contained in:
Jonas Greitemann
2025-01-11 18:37:48 +01:00
committed by Klemens Morgenstern
parent 529fb1e222
commit ab28b511a9
56 changed files with 190 additions and 77 deletions

View File

@@ -21,9 +21,7 @@
#include <boost/algorithm/string/predicate.hpp>
namespace bp = boost::process;
namespace bp = boost::process;
namespace bp = boost::process::v1;
BOOST_AUTO_TEST_CASE(args, *boost::unit_test::timeout(2))
{

View File

@@ -19,7 +19,7 @@
#include <boost/process/v1/error.hpp>
#include <boost/process/v1/child.hpp>
namespace bp = boost::process;
namespace bp = boost::process::v1;
BOOST_AUTO_TEST_CASE(implicit_args_fs_path)

View File

@@ -3,11 +3,34 @@
// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
#define BOOST_ASIO_NO_DEPRECATED 1
#include <boost/process.hpp>
#include <boost/process/v1/args.hpp>
#include <boost/process/v1/async.hpp>
#include <boost/process/v1/async_pipe.hpp>
#include <boost/process/v1/async_system.hpp>
#include <boost/process/v1/child.hpp>
#include <boost/process/v1/cmd.hpp>
#include <boost/process/v1/env.hpp>
#include <boost/process/v1/environment.hpp>
#include <boost/process/v1/error.hpp>
#include <boost/process/v1/exception.hpp>
#include <boost/process/v1/exe.hpp>
#include <boost/process/v1/extend.hpp>
#include <boost/process/v1/filesystem.hpp>
#include <boost/process/v1/group.hpp>
#include <boost/process/v1/handles.hpp>
#include <boost/process/v1/io.hpp>
#include <boost/process/v1/locale.hpp>
#include <boost/process/v1/pipe.hpp>
#include <boost/process/v1/search_path.hpp>
#include <boost/process/v1/shell.hpp>
#include <boost/process/v1/spawn.hpp>
#include <boost/process/v1/start_dir.hpp>
#include <boost/process/v1/system.hpp>
int main() {}
#if defined(BOOST_POSIX_API)
#include <boost/process/v1/posix.hpp>
#else
#include <boost/process/v1/windows.hpp>
#endif
#endif

View File

@@ -25,7 +25,7 @@
using namespace std;
namespace bp = boost::process;
namespace bp = boost::process::v1;
#if __APPLE__
auto abort_sig = signal(SIGALRM, +[](int){std::terminate();});

View File

@@ -29,7 +29,7 @@ BOOST_AUTO_TEST_SUITE( async );
using namespace std;
namespace bp = boost::process;
namespace bp = boost::process::v1;
BOOST_AUTO_TEST_CASE(async_out_future, *boost::unit_test::timeout(2))
{
@@ -103,4 +103,4 @@ BOOST_AUTO_TEST_CASE(emtpy_out, *boost::unit_test::timeout(2))
BOOST_CHECK_EQUAL(fut.get(), "");
}
BOOST_AUTO_TEST_SUITE_END();
BOOST_AUTO_TEST_SUITE_END();

View File

@@ -20,7 +20,7 @@
#include <boost/asio/streambuf.hpp>
using namespace std;
namespace bp = boost::process;
namespace bp = boost::process::v1;
namespace asio = boost::asio;
BOOST_AUTO_TEST_SUITE( async );

View File

@@ -18,7 +18,7 @@
#include <boost/process/v1/async_system.hpp>
#include <system_error>
namespace bp = boost::process;;
namespace bp = boost::process::v1;
void fail_func()
{

View File

@@ -23,7 +23,7 @@
#include <vector>
#include <array>
namespace bp = boost::process;
namespace bp = boost::process::v1;
BOOST_AUTO_TEST_SUITE( async );
BOOST_AUTO_TEST_CASE(future, *boost::unit_test::timeout(15))

View File

@@ -27,7 +27,7 @@
#include <array>
BOOST_AUTO_TEST_SUITE( async );
namespace bp = boost::process;
namespace bp = boost::process::v1;
BOOST_AUTO_TEST_CASE(stackful, *boost::unit_test::timeout(15))
{
using boost::unit_test::framework::master_test_suite;

View File

@@ -26,7 +26,7 @@
#include <array>
BOOST_AUTO_TEST_SUITE( async );
namespace bp = boost::process;
namespace bp = boost::process::v1;
BOOST_AUTO_TEST_CASE(stackful, *boost::unit_test::timeout(15))
{
using boost::unit_test::framework::master_test_suite;

View File

@@ -26,7 +26,7 @@
#include <array>
BOOST_AUTO_TEST_SUITE( async );
namespace bp = boost::process;
namespace bp = boost::process::v1;
BOOST_AUTO_TEST_CASE(stackful_except, *boost::unit_test::timeout(15))
{
using boost::unit_test::framework::master_test_suite;

View File

@@ -25,7 +25,7 @@
#include <array>
BOOST_AUTO_TEST_SUITE( async );
namespace bp = boost::process;
namespace bp = boost::process::v1;
BOOST_AUTO_TEST_CASE(stackless, *boost::unit_test::timeout(15))
{
using boost::unit_test::framework::master_test_suite;

View File

@@ -39,7 +39,7 @@ typedef boost::asio::posix::stream_descriptor pipe_end;
#endif
namespace fs = boost::process::v1::filesystem;
namespace bp = boost::process;
namespace bp = boost::process::v1;
BOOST_AUTO_TEST_SUITE( bind_stderr );
BOOST_AUTO_TEST_CASE(sync_io, *boost::unit_test::timeout(2))

View File

@@ -43,7 +43,7 @@ typedef boost::asio::posix::stream_descriptor pipe_end;
namespace fs = boost::process::v1::filesystem;
namespace bp = boost::process;
namespace bp = boost::process::v1;
BOOST_AUTO_TEST_CASE(sync_io, *boost::unit_test::timeout(10))
{

View File

@@ -22,7 +22,7 @@
#include <string>
#include <iostream>
namespace bp = boost::process;
namespace bp = boost::process::v1;
BOOST_AUTO_TEST_SUITE( bind_stdin_stdout );
BOOST_AUTO_TEST_CASE(sync_io, *boost::unit_test::timeout(10))

View File

@@ -42,7 +42,7 @@ BOOST_AUTO_TEST_SUITE( bind_stdout );
namespace fs = boost::process::v1::filesystem;
namespace bp = boost::process;
namespace bp = boost::process::v1;
BOOST_AUTO_TEST_CASE(sync_io, *boost::unit_test::timeout(5))
{

View File

@@ -34,7 +34,7 @@ typedef boost::asio::windows::stream_handle pipe_end;
typedef boost::asio::posix::stream_descriptor pipe_end;
#endif
namespace bp = boost::process;
namespace bp = boost::process::v1;
BOOST_AUTO_TEST_SUITE( bind_stdout_stderr );

View File

@@ -22,7 +22,7 @@
# include <sys/wait.h>
#endif
namespace bp = boost::process;
namespace bp = boost::process::v1;
BOOST_AUTO_TEST_CASE(close_stderr)

View File

@@ -22,7 +22,7 @@
# include <sys/wait.h>
#endif
namespace bp = boost::process;
namespace bp = boost::process::v1;
BOOST_AUTO_TEST_CASE(close_stdin)
{

View File

@@ -22,7 +22,7 @@
# include <sys/wait.h>
#endif
namespace bp = boost::process;
namespace bp = boost::process::v1;
BOOST_AUTO_TEST_CASE(close_stdout)
{

View File

@@ -26,7 +26,7 @@
#include <boost/system/error_code.hpp>
#include <cstdlib>
namespace bp = boost::process;
namespace bp = boost::process::v1;
namespace fs = boost::process::v1::filesystem;

View File

@@ -27,7 +27,7 @@
#include <stdlib.h>
#include <list>
namespace bp = boost::process;
namespace bp = boost::process::v1;
BOOST_AUTO_TEST_CASE(inherit_env, *boost::unit_test::timeout(2))
{

View File

@@ -12,7 +12,7 @@
#include <boost/test/included/unit_test.hpp>
#include <boost/process/v1/environment.hpp>
namespace bp = boost::process;
namespace bp = boost::process::v1;
namespace std

View File

@@ -19,7 +19,7 @@
namespace bp = boost::process;
namespace bp = boost::process::v1;
struct err_set
{

View File

@@ -26,7 +26,7 @@ typedef boost::asio::windows::stream_handle pipe_end;
typedef boost::asio::posix::stream_descriptor pipe_end;
#endif
namespace bp = boost::process;
namespace bp = boost::process::v1;
BOOST_AUTO_TEST_CASE(sync_wait, *boost::unit_test::timeout(10))
{

View File

@@ -17,7 +17,7 @@
#include <boost/process/v1/extend.hpp>
namespace bp = boost::process;
namespace bp = boost::process::v1;
struct run_exe

View File

@@ -29,7 +29,7 @@
#include <iostream>
#include <cstdlib>
namespace bp = boost::process;
namespace bp = boost::process::v1;
BOOST_AUTO_TEST_CASE(group_test, *boost::unit_test::timeout(5))
{

View File

@@ -30,7 +30,7 @@
#include <iostream>
#include <cstdlib>
namespace bp = boost::process;
namespace bp = boost::process::v1;

View File

@@ -7,9 +7,7 @@
#define BOOST_TEST_IGNORE_SIGCHLD
#include <boost/test/included/unit_test.hpp>
#include <iostream>
#include <boost/process.hpp>
#include <boost/process/v1/system.hpp>
#include <boost/process/v1/handles.hpp>
#include <boost/process/v1/pipe.hpp>
#include <boost/process/v1/io.hpp>
@@ -32,8 +30,7 @@
#include <dirent.h>
#endif
namespace fs = boost::process::v1::filesystem;
namespace bp = boost::process;
namespace bp = boost::process::v1;
namespace bt = boost::this_process;
BOOST_AUTO_TEST_CASE(leak_test, *boost::unit_test::timeout(5))

View File

@@ -4,4 +4,32 @@
// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
#include <boost/process.hpp>
#include <boost/process/v1/args.hpp>
#include <boost/process/v1/async.hpp>
#include <boost/process/v1/async_pipe.hpp>
#include <boost/process/v1/async_system.hpp>
#include <boost/process/v1/child.hpp>
#include <boost/process/v1/cmd.hpp>
#include <boost/process/v1/env.hpp>
#include <boost/process/v1/environment.hpp>
#include <boost/process/v1/error.hpp>
#include <boost/process/v1/exception.hpp>
#include <boost/process/v1/exe.hpp>
#include <boost/process/v1/extend.hpp>
#include <boost/process/v1/filesystem.hpp>
#include <boost/process/v1/group.hpp>
#include <boost/process/v1/handles.hpp>
#include <boost/process/v1/io.hpp>
#include <boost/process/v1/locale.hpp>
#include <boost/process/v1/pipe.hpp>
#include <boost/process/v1/search_path.hpp>
#include <boost/process/v1/shell.hpp>
#include <boost/process/v1/spawn.hpp>
#include <boost/process/v1/start_dir.hpp>
#include <boost/process/v1/system.hpp>
#if defined(BOOST_POSIX_API)
#include <boost/process/v1/posix.hpp>
#else
#include <boost/process/v1/windows.hpp>
#endif

View File

@@ -3,4 +3,32 @@
// Distributed under the Boost Software License, Version 1.0. (See accompanying
// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
#include <boost/process.hpp>
#include <boost/process/v1/args.hpp>
#include <boost/process/v1/async.hpp>
#include <boost/process/v1/async_pipe.hpp>
#include <boost/process/v1/async_system.hpp>
#include <boost/process/v1/child.hpp>
#include <boost/process/v1/cmd.hpp>
#include <boost/process/v1/env.hpp>
#include <boost/process/v1/environment.hpp>
#include <boost/process/v1/error.hpp>
#include <boost/process/v1/exception.hpp>
#include <boost/process/v1/exe.hpp>
#include <boost/process/v1/extend.hpp>
#include <boost/process/v1/filesystem.hpp>
#include <boost/process/v1/group.hpp>
#include <boost/process/v1/handles.hpp>
#include <boost/process/v1/io.hpp>
#include <boost/process/v1/locale.hpp>
#include <boost/process/v1/pipe.hpp>
#include <boost/process/v1/search_path.hpp>
#include <boost/process/v1/shell.hpp>
#include <boost/process/v1/spawn.hpp>
#include <boost/process/v1/start_dir.hpp>
#include <boost/process/v1/system.hpp>
#if defined(BOOST_POSIX_API)
#include <boost/process/v1/posix.hpp>
#else
#include <boost/process/v1/windows.hpp>
#endif

View File

@@ -6,5 +6,30 @@
#include <boost/system/api_config.hpp>
#if defined(BOOST_WINDOWS_API)
#define BOOST_NO_ANSI_APIS 1
#include <boost/process/v1/args.hpp>
#include <boost/process/v1/async.hpp>
#include <boost/process/v1/async_pipe.hpp>
#include <boost/process/v1/async_system.hpp>
#include <boost/process/v1/child.hpp>
#include <boost/process/v1/cmd.hpp>
#include <boost/process/v1/env.hpp>
#include <boost/process/v1/environment.hpp>
#include <boost/process/v1/error.hpp>
#include <boost/process/v1/exception.hpp>
#include <boost/process/v1/exe.hpp>
#include <boost/process/v1/extend.hpp>
#include <boost/process/v1/filesystem.hpp>
#include <boost/process/v1/group.hpp>
#include <boost/process/v1/handles.hpp>
#include <boost/process/v1/io.hpp>
#include <boost/process/v1/locale.hpp>
#include <boost/process/v1/pipe.hpp>
#include <boost/process/v1/search_path.hpp>
#include <boost/process/v1/shell.hpp>
#include <boost/process/v1/spawn.hpp>
#include <boost/process/v1/start_dir.hpp>
#include <boost/process/v1/system.hpp>
#include <boost/process/v1/windows.hpp>
#endif
#include <boost/process.hpp>
int main() {}

View File

@@ -10,7 +10,8 @@
#define BOOST_TEST_MAIN
#define BOOST_TEST_IGNORE_SIGCHLD
#include <boost/test/included/unit_test.hpp>
#include <boost/process.hpp>
#include <boost/process/v1/async.hpp>
#include <boost/process/v1/child.hpp>
#include <boost/asio.hpp>
#include <chrono>
#include <thread>
@@ -26,7 +27,7 @@ BOOST_AUTO_TEST_CASE(single_ios, *boost::unit_test::timeout(6))
return;
}
namespace bp = boost::process;
namespace bp = boost::process::v1;
boost::asio::io_context ios;
std::chrono::steady_clock::time_point p1, p2;

View File

@@ -10,7 +10,8 @@
#define BOOST_TEST_MAIN
#define BOOST_TEST_IGNORE_SIGCHLD
#include <boost/test/included/unit_test.hpp>
#include <boost/process.hpp>
#include <boost/process/v1/async.hpp>
#include <boost/process/v1/child.hpp>
#include <boost/asio.hpp>
#include <chrono>
#include <thread>
@@ -26,7 +27,7 @@ BOOST_AUTO_TEST_CASE(double_ios, *boost::unit_test::timeout(6))
return;
}
namespace bp = boost::process;
namespace bp = boost::process::v1;
boost::asio::io_context ios;
std::chrono::steady_clock::time_point p1, p2;

View File

@@ -10,7 +10,8 @@
#define BOOST_TEST_MAIN
#define BOOST_TEST_IGNORE_SIGCHLD
#include <boost/test/included/unit_test.hpp>
#include <boost/process.hpp>
#include <boost/process/v1/async.hpp>
#include <boost/process/v1/child.hpp>
#include <boost/asio.hpp>
#include <chrono>
#include <thread>
@@ -26,7 +27,7 @@ BOOST_AUTO_TEST_CASE(double_ios_threaded, *boost::unit_test::timeout(6))
return;
}
namespace bp = boost::process;
namespace bp = boost::process::v1;
boost::asio::io_context ios;
std::chrono::steady_clock::time_point p1, p2;

View File

@@ -14,7 +14,7 @@
#include <boost/process/v1/environment.hpp>
using namespace std;
namespace bp = boost::process;
namespace bp = boost::process::v1;
BOOST_AUTO_TEST_SUITE( pipe_tests );

View File

@@ -29,7 +29,7 @@
BOOST_AUTO_TEST_SUITE( pipe_tests );
namespace bp = boost::process;
namespace bp = boost::process::v1;
BOOST_AUTO_TEST_CASE(sync_io, *boost::unit_test::timeout(5))
{

View File

@@ -11,10 +11,14 @@
#define BOOST_TEST_IGNORE_SIGCHLD
#include <boost/test/included/unit_test.hpp>
#include <boost/process.hpp>
#include <boost/process/v1/posix.hpp>
#include <boost/process/v1/child.hpp>
#include <boost/process/v1/environment.hpp>
#include <boost/process/v1/filesystem.hpp>
#include <boost/process/v1/io.hpp>
#include <boost/process/v1/pipe.hpp>
#include <boost/process/v1/posix.hpp>
#include <boost/process/v1/spawn.hpp>
#include <boost/process/v1/system.hpp>
#if !defined(BOOST_PROCESS_USE_STD_FS)
#include <boost/filesystem/directory.hpp>
@@ -29,7 +33,7 @@
#include <errno.h>
namespace fs = boost::process::v1::filesystem;
namespace bp = boost::process;
namespace bp = boost::process::v1;
BOOST_AUTO_TEST_CASE(bind_fd, *boost::unit_test::timeout(2))
{

View File

@@ -15,7 +15,7 @@
#include <boost/process/v1/error.hpp>
#include <boost/process/v1/child.hpp>
namespace bp = boost::process;
namespace bp = boost::process::v1;
int main(int argc, char* argv[])
{

View File

@@ -18,7 +18,7 @@
#include <boost/process/v1/error.hpp>
#include <boost/process/v1/child.hpp>
namespace bp = boost::process;
namespace bp = boost::process::v1;
BOOST_AUTO_TEST_CASE(run_exe_success)

View File

@@ -13,7 +13,7 @@
#include <boost/process/v1/filesystem.hpp>
#include <string>
namespace bp = boost::process;
namespace bp = boost::process::v1;
namespace fs = boost::process::v1::filesystem;
BOOST_AUTO_TEST_CASE(search_path)

View File

@@ -22,7 +22,7 @@
#include <boost/process/v1/child.hpp>
#include <boost/process/v1/shell.hpp>
namespace bp = boost::process;
namespace bp = boost::process::v1;
BOOST_AUTO_TEST_CASE(shell_simple, *boost::unit_test::timeout(5))

View File

@@ -13,7 +13,7 @@
#include <boost/process/v1/filesystem.hpp>
#include <system_error>
namespace bp = boost::process;
namespace bp = boost::process::v1;
BOOST_AUTO_TEST_CASE(shell_set_on_error)
{

View File

@@ -39,7 +39,7 @@ typedef boost::asio::posix::stream_descriptor pipe_end;
#endif
namespace fs = boost::process::v1::filesystem;
namespace bp = boost::process;
namespace bp = boost::process::v1;
BOOST_AUTO_TEST_CASE(sync_spawn, *boost::unit_test::timeout(5))
{

View File

@@ -35,7 +35,7 @@ typedef boost::asio::posix::stream_descriptor pipe_end;
#endif
namespace fs = boost::process::v1::filesystem;
namespace bp = boost::process;
namespace bp = boost::process::v1;
int main()
{

View File

@@ -10,14 +10,19 @@
#define BOOST_TEST_MAIN
#define BOOST_TEST_IGNORE_SIGCHLD
#include <boost/test/included/unit_test.hpp>
#include <boost/process.hpp>
#include <boost/system/error_code.hpp>
#include <boost/process/v1/args.hpp>
#include <boost/process/v1/child.hpp>
#include <boost/process/v1/exe.hpp>
#include <boost/process/v1/filesystem.hpp>
#include <boost/process/v1/io.hpp>
#include <boost/process/v1/pipe.hpp>
#include <boost/process/v1/start_dir.hpp>
#include <boost/algorithm/string/compare.hpp>
#include <string>
#include <iostream>
namespace bp = boost::process;
#include <string>
namespace bp = boost::process::v1;
struct test_dir

View File

@@ -2,7 +2,9 @@
// Distributed under the Boost Software License, Version 1.0. (See accompanying
// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
#include <boost/process.hpp>
#include <boost/process/v1/child.hpp>
#include <boost/process/v1/io.hpp>
#include <boost/process/v1/group.hpp>
#include <boost/program_options.hpp>
#include <vector>
@@ -20,7 +22,7 @@ int main(int argc, char *argv[])
{
using namespace std;
using namespace boost::program_options;
using namespace boost::process;
using namespace boost::process::v1;
bool launch_detached = false;
bool launch_attached = false;

View File

@@ -44,7 +44,7 @@ typedef boost::asio::posix::stream_descriptor pipe_end;
#endif
namespace fs = boost::process::v1::filesystem;
namespace bp = boost::process;
namespace bp = boost::process::v1;
BOOST_AUTO_TEST_CASE(system_exit_code, *boost::unit_test::timeout(5))
{

View File

@@ -38,7 +38,7 @@
#include <cstdlib>
namespace fs = boost::process::v1::filesystem;
namespace bp = boost::process;
namespace bp = boost::process::v1;
BOOST_AUTO_TEST_CASE(explicit_async_io, *boost::unit_test::timeout(2))
{

View File

@@ -20,7 +20,7 @@
#include <system_error>
#include <thread>
namespace bp = boost::process;
namespace bp = boost::process::v1;
BOOST_AUTO_TEST_CASE(terminate_set_on_error, *boost::unit_test::timeout(5))
{

View File

@@ -9,11 +9,11 @@
#include <boost/core/lightweight_test.hpp>
#include <boost/process.hpp>
#include <boost/process/v1/child.hpp>
#include <boost/process/v1/cmd.hpp>
#include <system_error>
namespace bp = boost::process;
namespace bp = boost::process::v1;
int main(int argc, char* argv[])
{

View File

@@ -11,7 +11,7 @@
#define BOOST_TEST_IGNORE_SIGCHLD
#include <boost/test/included/unit_test.hpp>
#include <boost/process.hpp>
#include <boost/process/v1.hpp>
#include <boost/process/v1/posix.hpp>
#include <system_error>
@@ -21,7 +21,7 @@
#include <sys/wait.h>
#include <errno.h>
namespace bp = boost::process;
namespace bp = boost::process::v1;
#if defined(BOOST_POSIX_HAS_VFORK)

View File

@@ -22,7 +22,7 @@
# include <signal.h>
#endif
namespace bp = boost::process;
namespace bp = boost::process::v1;
BOOST_AUTO_TEST_SUITE( wait_test );

View File

@@ -21,7 +21,7 @@
# include <signal.h>
#endif
namespace bp = boost::process;
namespace bp = boost::process::v1;
BOOST_AUTO_TEST_SUITE( wait_test);
BOOST_AUTO_TEST_CASE(wait_for)

View File

@@ -21,7 +21,7 @@
#include <boost/algorithm/string/predicate.hpp>
namespace bp = boost::process;
namespace bp = boost::process::v1;
BOOST_AUTO_TEST_CASE(wargs, *boost::unit_test::timeout(2))

View File

@@ -10,14 +10,14 @@
#define BOOST_TEST_MAIN
#define BOOST_TEST_IGNORE_SIGCHLD
#include <boost/test/included/unit_test.hpp>
#include <boost/process.hpp>
#include <boost/process/v1.hpp>
#include <boost/process/v1/windows.hpp>
#include <boost/process/v1/extend.hpp>
#include <boost/system/error_code.hpp>
#include <string>
namespace bp = boost::process;
namespace bp = boost::process::v1;
BOOST_AUTO_TEST_CASE(show_window)
{