From b344ca78ad3127849b0aeacf72350e55648f7d3d Mon Sep 17 00:00:00 2001 From: xoviat Date: Sun, 20 Aug 2023 19:53:55 -0500 Subject: [PATCH 1/8] revert channges to quote argument --- subprocess.hpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/subprocess.hpp b/subprocess.hpp index 6f91090..cc1933e 100755 --- a/subprocess.hpp +++ b/subprocess.hpp @@ -178,9 +178,9 @@ namespace util // need to do so --- hopefully avoid problems if programs won't // parse quotes properly // - bool containsCharThatNeedsQuoting = argument.find_first_of(L" \t\n\v\"") != argument.npos; - bool containsCharThatNeedsNoQuoting = argument.find_first_of(L"/") != argument.npos; - if (!force && !argument.empty() && (!containsCharThatNeedsQuoting || containsCharThatNeedsNoQuoting)) { + + if (force == false && argument.empty() == false && + argument.find_first_of(L" \t\n\v\"") == argument.npos) { command_line.append(argument); } else { From f677f4411f9256068210c334c1a22e77755ed62c Mon Sep 17 00:00:00 2001 From: xoviat Date: Sun, 20 Aug 2023 19:59:18 -0500 Subject: [PATCH 2/8] ci: add cmake draft --- .github/workflows/cmake-multi-platform.yml | 75 ++++++++++++++++++++++ 1 file changed, 75 insertions(+) create mode 100644 .github/workflows/cmake-multi-platform.yml diff --git a/.github/workflows/cmake-multi-platform.yml b/.github/workflows/cmake-multi-platform.yml new file mode 100644 index 0000000..9ec0432 --- /dev/null +++ b/.github/workflows/cmake-multi-platform.yml @@ -0,0 +1,75 @@ +# This starter workflow is for a CMake project running on multiple platforms. There is a different starter workflow if you just want a single platform. +# See: https://github.com/actions/starter-workflows/blob/main/ci/cmake-single-platform.yml +name: CMake on multiple platforms + +on: + push: + branches: [ "master" ] + pull_request: + branches: [ "master" ] + +jobs: + build: + runs-on: ${{ matrix.os }} + + strategy: + # Set fail-fast to false to ensure that feedback is delivered for all matrix combinations. Consider changing this to true when your workflow is stable. + fail-fast: false + + # Set up a matrix to run the following 3 configurations: + # 1. + # 2. + # 3. + # + # To add more build types (Release, Debug, RelWithDebInfo, etc.) customize the build_type list. + matrix: + os: [ubuntu-latest, windows-latest] + build_type: [Release] + c_compiler: [gcc, clang, cl] + include: + - os: windows-latest + c_compiler: cl + cpp_compiler: cl + - os: ubuntu-latest + c_compiler: gcc + cpp_compiler: g++ + - os: ubuntu-latest + c_compiler: clang + cpp_compiler: clang++ + exclude: + - os: windows-latest + c_compiler: gcc + - os: windows-latest + c_compiler: clang + - os: ubuntu-latest + c_compiler: cl + + steps: + - uses: actions/checkout@v3 + + - name: Set reusable strings + # Turn repeated input strings (such as the build output directory) into step outputs. These step outputs can be used throughout the workflow file. + id: strings + shell: bash + run: | + echo "build-output-dir=${{ github.workspace }}/build" >> "$GITHUB_OUTPUT" + + - name: Configure CMake + # Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make. + # See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type + run: > + cmake -B ${{ steps.strings.outputs.build-output-dir }} + -DCMAKE_CXX_COMPILER=${{ matrix.cpp_compiler }} + -DCMAKE_C_COMPILER=${{ matrix.c_compiler }} + -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} + -S ${{ github.workspace }} + + - name: Build + # Build your program with the given configuration. Note that --config is needed because the default Windows generator is a multi-config generator (Visual Studio generator). + run: cmake --build ${{ steps.strings.outputs.build-output-dir }} --config ${{ matrix.build_type }} + + - name: Test + working-directory: ${{ steps.strings.outputs.build-output-dir }} + # Execute tests defined by the CMake configuration. Note that --build-config is needed because the default Windows generator is a multi-config generator (Visual Studio generator). + # See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail + run: ctest --build-config ${{ matrix.build_type }} From 0a28c8c6ebac23167190cfc4a661ed164efb44ee Mon Sep 17 00:00:00 2001 From: xoviat Date: Sun, 20 Aug 2023 20:02:14 -0500 Subject: [PATCH 3/8] ci: enable suprocess tests --- .github/workflows/cmake-multi-platform.yml | 1 + CMakeLists.txt | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/cmake-multi-platform.yml b/.github/workflows/cmake-multi-platform.yml index 9ec0432..82117d9 100644 --- a/.github/workflows/cmake-multi-platform.yml +++ b/.github/workflows/cmake-multi-platform.yml @@ -62,6 +62,7 @@ jobs: -DCMAKE_CXX_COMPILER=${{ matrix.cpp_compiler }} -DCMAKE_C_COMPILER=${{ matrix.c_compiler }} -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} + -DSUBPROCESS_TESTS=ON -S ${{ github.workspace }} - name: Build diff --git a/CMakeLists.txt b/CMakeLists.txt index 0f4128a..4c8becc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,7 +3,7 @@ project(subprocess VERSION 0.0.1 LANGUAGES CXX) set(CMAKE_CXX_STANDARD 11 CACHE STRING "C++ standard to use") option(EXPORT_COMPILE_COMMANDS "create clang compile database" ON) -option(SUBPROCESS_TESTS "enalbe subprocess tests" OFF) +option(SUBPROCESS_TESTS "enable subprocess tests" OFF) find_package(Threads REQUIRED) From a32c0f3df4b6bcd1d2e93f19e8f380bb890cd507 Mon Sep 17 00:00:00 2001 From: xoviat Date: Sun, 20 Aug 2023 20:12:00 -0500 Subject: [PATCH 4/8] cleanup some warnings --- subprocess.hpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/subprocess.hpp b/subprocess.hpp index cc1933e..a3d4dd9 100755 --- a/subprocess.hpp +++ b/subprocess.hpp @@ -64,6 +64,10 @@ extern "C" { #include #include #include + + #define close _close + #define open _open + #define fileno _fileno #else #include #include From 8dbbfc64bc12b19c4d6d95bdcb464851316b2e3e Mon Sep 17 00:00:00 2001 From: xoviat Date: Sun, 20 Aug 2023 20:32:04 -0500 Subject: [PATCH 5/8] ci: disable nonworking windows tests --- test/test_cat.cc | 5 +++++ test/test_env.cc | 6 ++++++ test/test_subprocess.cc | 6 +++--- 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/test/test_cat.cc b/test/test_cat.cc index b33021c..1c2ac54 100755 --- a/test/test_cat.cc +++ b/test/test_cat.cc @@ -58,6 +58,8 @@ void test_buffer_growth_threaded_comm() } int main() { +#ifndef __USING_WINDOWS__ + // test_cat_pipe_redirection(); test_cat_send_terminate(); /* @@ -65,5 +67,8 @@ int main() { test_buffer_growth(); test_buffer_growth_threaded_comm(); */ + +#endif + return 0; } diff --git a/test/test_env.cc b/test/test_env.cc index 8b041fa..8a561d5 100644 --- a/test/test_env.cc +++ b/test/test_env.cc @@ -3,6 +3,8 @@ using namespace subprocess; +#ifndef __USING_WINDOWS__ + void test_env() { int st= Popen("./env_script.sh", environment{{ @@ -13,7 +15,11 @@ void test_env() assert (st == 0); } +#endif + int main() { +#ifndef __USING_WINDOWS__ test_env(); +#endif return 0; } diff --git a/test/test_subprocess.cc b/test/test_subprocess.cc index efd721d..01d258d 100755 --- a/test/test_subprocess.cc +++ b/test/test_subprocess.cc @@ -5,7 +5,7 @@ using namespace subprocess; void test_exename() { -#ifdef _MSC_VER +#ifdef __USING_WINDOWS__ auto ret = call({"--version"}, executable{"cmake"}, shell{false}); #else auto ret = call({"-l"}, executable{"ls"}, shell{false}); @@ -39,7 +39,7 @@ void test_easy_piping() void test_shell() { -#ifdef _MSC_VER +#ifdef __USING_WINDOWS__ auto obuf = check_output({"cmake", "--version"}, shell{false}); #else auto obuf = check_output({"ls", "-l"}, shell{false}); @@ -54,7 +54,7 @@ void test_sleep() while (p.poll() == -1) { std::cout << "Waiting..." << std::endl; -#ifdef _MSC_VER +#ifdef __USING_WINDOWS__ #else sleep(1); #endif From a1e877a01f7a944ec2498fe6d41abf58b27a0f19 Mon Sep 17 00:00:00 2001 From: xoviat Date: Sun, 20 Aug 2023 20:35:56 -0500 Subject: [PATCH 6/8] ci: set timeout --- .github/workflows/cmake-multi-platform.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cmake-multi-platform.yml b/.github/workflows/cmake-multi-platform.yml index 82117d9..34aac8e 100644 --- a/.github/workflows/cmake-multi-platform.yml +++ b/.github/workflows/cmake-multi-platform.yml @@ -73,4 +73,4 @@ jobs: working-directory: ${{ steps.strings.outputs.build-output-dir }} # Execute tests defined by the CMake configuration. Note that --build-config is needed because the default Windows generator is a multi-config generator (Visual Studio generator). # See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail - run: ctest --build-config ${{ matrix.build_type }} + run: ctest --build-config ${{ matrix.build_type }} --timeout 10 -j4 From dda00cc443d8f908d5aae3bd006036952b7bf8dd Mon Sep 17 00:00:00 2001 From: xoviat Date: Sun, 20 Aug 2023 20:40:02 -0500 Subject: [PATCH 7/8] ci: disable nonworking tests on windows --- test/test_err_redirection.cc | 2 ++ test/test_ret_code.cc | 2 ++ 2 files changed, 4 insertions(+) diff --git a/test/test_err_redirection.cc b/test/test_err_redirection.cc index e01e15e..97c1459 100644 --- a/test/test_err_redirection.cc +++ b/test/test_err_redirection.cc @@ -11,6 +11,8 @@ void test_redirect() } int main() { +#ifndef __USING_WINDOWS__ test_redirect(); +#endif return 0; } diff --git a/test/test_ret_code.cc b/test/test_ret_code.cc index 301a091..06b5f75 100644 --- a/test/test_ret_code.cc +++ b/test/test_ret_code.cc @@ -44,8 +44,10 @@ void test_ret_code_check_output() int main() { // test_ret_code(); +#ifndef __USING_WINDOWS__ test_ret_code_comm(); test_ret_code_check_output(); +#endif return 0; } From 9c4ffd6e29ca07e94b2c8527dbb7755dd49abfb6 Mon Sep 17 00:00:00 2001 From: xoviat Date: Sun, 20 Aug 2023 20:41:22 -0500 Subject: [PATCH 8/8] ci: remove travis --- .travis.yml | 11 ----------- 1 file changed, 11 deletions(-) delete mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index c5c1338..0000000 --- a/.travis.yml +++ /dev/null @@ -1,11 +0,0 @@ -language: cpp - -compiler: - - clang - - gcc - -script: - - mkdir -p build && cd build - - cmake -DCMAKE_BUILD_TYPE=Debug -DSUBPROCESS_TESTS=ON .. - - cmake --build . --config Debug -- -j $(nproc) - - ctest -j $(nproc) --output-on-failure \ No newline at end of file