Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix v1 tests after v2 became the default #450

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Fix v1 tests after v2 became the default #450

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions test/v1/args_cmd.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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))
{
Expand Down
2 changes: 1 addition & 1 deletion test/v1/args_handling.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
27 changes: 25 additions & 2 deletions test/v1/asio_no_deprecated.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion test/v1/async.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();});
Expand Down
4 changes: 2 additions & 2 deletions test/v1/async_fut.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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))
{
Expand Down Expand Up @@ -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();
2 changes: 1 addition & 1 deletion test/v1/async_pipe.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 );
Expand Down
2 changes: 1 addition & 1 deletion test/v1/async_system_fail.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
{
Expand Down
2 changes: 1 addition & 1 deletion test/v1/async_system_future.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down
2 changes: 1 addition & 1 deletion test/v1/async_system_stackful.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion test/v1/async_system_stackful_error.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion test/v1/async_system_stackful_except.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion test/v1/async_system_stackless.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion test/v1/bind_stderr.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down
2 changes: 1 addition & 1 deletion test/v1/bind_stdin.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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))
{
Expand Down
2 changes: 1 addition & 1 deletion test/v1/bind_stdin_stdout.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down
2 changes: 1 addition & 1 deletion test/v1/bind_stdout.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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))
{
Expand Down
2 changes: 1 addition & 1 deletion test/v1/bind_stdout_stderr.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 );

Expand Down
2 changes: 1 addition & 1 deletion test/v1/close_stderr.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
# include <sys/wait.h>
#endif

namespace bp = boost::process;
namespace bp = boost::process::v1;


BOOST_AUTO_TEST_CASE(close_stderr)
Expand Down
2 changes: 1 addition & 1 deletion test/v1/close_stdin.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
# include <sys/wait.h>
#endif

namespace bp = boost::process;
namespace bp = boost::process::v1;

BOOST_AUTO_TEST_CASE(close_stdin)
{
Expand Down
2 changes: 1 addition & 1 deletion test/v1/close_stdout.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
# include <sys/wait.h>
#endif

namespace bp = boost::process;
namespace bp = boost::process::v1;

BOOST_AUTO_TEST_CASE(close_stdout)
{
Expand Down
2 changes: 1 addition & 1 deletion test/v1/cmd_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;


Expand Down
2 changes: 1 addition & 1 deletion test/v1/env.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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))
{
Expand Down
2 changes: 1 addition & 1 deletion test/v1/environment.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion test/v1/error.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@



namespace bp = boost::process;
namespace bp = boost::process::v1;

struct err_set
{
Expand Down
2 changes: 1 addition & 1 deletion test/v1/exit_code.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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))
{
Expand Down
2 changes: 1 addition & 1 deletion test/v1/extensions.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
#include <boost/process/v1/extend.hpp>


namespace bp = boost::process;
namespace bp = boost::process::v1;


struct run_exe
Expand Down
2 changes: 1 addition & 1 deletion test/v1/group.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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))
{
Expand Down
2 changes: 1 addition & 1 deletion test/v1/group_wait.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
#include <iostream>
#include <cstdlib>

namespace bp = boost::process;
namespace bp = boost::process::v1;



Expand Down
7 changes: 2 additions & 5 deletions test/v1/limit_fd.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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))
Expand Down
30 changes: 29 additions & 1 deletion test/v1/multi_ref1.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
30 changes: 29 additions & 1 deletion test/v1/multi_ref2.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Loading
Loading