diff options
| author | Benjamin Chausse <benjamin@chausse.xyz> | 2023-11-07 13:17:03 -0500 |
|---|---|---|
| committer | Benjamin Chausse <benjamin@chausse.xyz> | 2023-11-07 13:17:03 -0500 |
| commit | 867da67971aa484d875f813a8dc07bd2a365b235 (patch) | |
| tree | fcc2ca241f85a4723bfa11ad051e3d9ed3128799 | |
| parent | c0b0af665dc9a58fa0a30e1ee11b679214783cbc (diff) | |
Use shutil.which to detect installation on windows
| -rw-r--r-- | benchmarking/test-suite/requirements_win.txt | 1 | ||||
| -rwxr-xr-x | benchmarking/test-suite/testsweet.py | 8 |
2 files changed, 7 insertions, 2 deletions
diff --git a/benchmarking/test-suite/requirements_win.txt b/benchmarking/test-suite/requirements_win.txt index 645fea3..a9855d0 100644 --- a/benchmarking/test-suite/requirements_win.txt +++ b/benchmarking/test-suite/requirements_win.txt @@ -1 +1,2 @@ +winapps windows-curses diff --git a/benchmarking/test-suite/testsweet.py b/benchmarking/test-suite/testsweet.py index 0bab25d..639d8ad 100755 --- a/benchmarking/test-suite/testsweet.py +++ b/benchmarking/test-suite/testsweet.py @@ -158,7 +158,11 @@ class Windows(OS): def is_installed(self, package): # Check if the package is installed on the system with where - return os.system(f"where {package}") == 0 + if shutil.which(package) is not None: + return True + else: + return False + # return os.system(f"where {package}") == 0 def install(self, package, force=False): # Cd into the cachedir @@ -436,7 +440,7 @@ def main(): if not host.is_installed("glances"): warnings.warn("glances is not installed. "+ " Monitoring will be disabled.\n"+ - "Consider installing it with pip install requirements.txt."+ + "Consider running pip install -r requirements.txt."+ "On windows, also use requirements_win.txt.") monitor = False host.run(test, iterations, monitor) |