diff options
| author | Daniel Moody <dmoody256@gmail.com> | 2022-06-07 14:34:28 -0500 |
|---|---|---|
| committer | Daniel Moody <dmoody256@gmail.com> | 2022-06-07 14:34:28 -0500 |
| commit | e3b2dd31e326a0d5b948fa35eae0cb1eefbbebf4 (patch) | |
| tree | bfe33f448208385307744994e4d8154a0714521c | |
| parent | 97a265e6da13a6a3827c599c23271b60aadef176 (diff) | |
| download | scons-git-e3b2dd31e326a0d5b948fa35eae0cb1eefbbebf4.tar.gz | |
install psutil for testing and fix sider complaints
| -rw-r--r-- | .github/workflows/experimental_tests.yml | 2 | ||||
| -rw-r--r-- | .github/workflows/runtest.yml | 2 | ||||
| -rw-r--r-- | SCons/Tool/ninja/ninja_daemon_build.py | 2 | ||||
| -rw-r--r-- | SCons/Tool/ninja/ninja_scons_daemon.py | 2 | ||||
| -rw-r--r-- | testing/framework/TestCmd.py | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/.github/workflows/experimental_tests.yml b/.github/workflows/experimental_tests.yml index 367214447..92fc13450 100644 --- a/.github/workflows/experimental_tests.yml +++ b/.github/workflows/experimental_tests.yml @@ -44,7 +44,7 @@ jobs: run: | python -m pip install --upgrade pip setuptools wheel python -m pip install ninja - # if [ -f requirements.txt ]; then pip install -r requirements.txt; fi + if [ -f requirements.txt ]; then python -m pip install -r requirements.txt; fi # sudo apt-get update - name: Test experimental packages ${{ matrix.os }} run: | diff --git a/.github/workflows/runtest.yml b/.github/workflows/runtest.yml index cfc585ebd..f37111b64 100644 --- a/.github/workflows/runtest.yml +++ b/.github/workflows/runtest.yml @@ -38,7 +38,7 @@ jobs: run: | python -m pip install --upgrade pip setuptools wheel python -m pip install ninja - # if [ -f requirements.txt ]; then pip install -r requirements.txt; fi + if [ -f requirements.txt ]; then python -m pip install -r requirements.txt; fi # sudo apt-get update - name: runtest ${{ matrix.os }} run: | diff --git a/SCons/Tool/ninja/ninja_daemon_build.py b/SCons/Tool/ninja/ninja_daemon_build.py index 63eb136e1..c21ea0bbd 100644 --- a/SCons/Tool/ninja/ninja_daemon_build.py +++ b/SCons/Tool/ninja/ninja_daemon_build.py @@ -65,7 +65,7 @@ while True: logging.debug(f"ERROR: Server pid not found {daemon_dir / 'pidfile'} for request {sys.argv[3]}") exit(1) else: - logging.debug(f"WARNING: Unecessary request to shutfown server, its already shutdown.") + logging.debug("WARNING: Unnecessary request to shutfown server, its already shutdown.") exit(0) logging.debug(f"Sending request: {sys.argv[3]}") diff --git a/SCons/Tool/ninja/ninja_scons_daemon.py b/SCons/Tool/ninja/ninja_scons_daemon.py index 35a7789e6..6802af293 100644 --- a/SCons/Tool/ninja/ninja_scons_daemon.py +++ b/SCons/Tool/ninja/ninja_scons_daemon.py @@ -225,7 +225,7 @@ def daemon_thread_func(): with building_cv: shared_state.finished_building += [building_node] daemon_ready = False - daemon_needs_to_shutdown = True + shared_state.daemon_needs_to_shutdown = True break else: diff --git a/testing/framework/TestCmd.py b/testing/framework/TestCmd.py index 34acb4d60..2d3428ce8 100644 --- a/testing/framework/TestCmd.py +++ b/testing/framework/TestCmd.py @@ -399,7 +399,7 @@ def clean_up_ninja_daemon(self, result_type): try: pid = int(f.read()) os.kill(pid, signal.SIGINT) - except OSError: + except OSError: pass while True: |