[Lldb-commits] [lldb] [lldb] Add Python requirements.txt for test suite (PR #94220)

[David Spickett via lldb-commits]

https://github.com/DavidSpickett updated https://github.com/llvm/llvm-project/pull/94220

>From e5a6eca78496e6f5ac67613f1f8368cf24ea1521 Mon Sep 17 00:00:00 2001
From: David Spickett <david.spickett at linaro.org>
Date: Mon, 3 Jun 2024 13:39:16 +0000
Subject: [PATCH 1/4] [lldb] Add Python requirements.txt for test suite

This means that CI won't have to hardcode these.

We can't do conditional installs here by platform so pexpect
is listed normally. If it's installed on Windows that's fine,
we just won't use it.
---
 lldb/requirements.txt | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100644 lldb/requirements.txt

diff --git a/lldb/requirements.txt b/lldb/requirements.txt
new file mode 100644
index 0000000000000..645004bd3f57c
--- /dev/null
+++ b/lldb/requirements.txt
@@ -0,0 +1,7 @@
+# These Python packages are required to be able to run the LLDB test suite.
+
+psutil
+# pexpect is only required on Linux, can be installed on Windows but pexpect
+# tests are automatically skipped there because they are known not to work
+# (llvm.org/pr22274).
+pexpect

>From c8bf4bf83e263ea48260c2f737868bd304b48e1f Mon Sep 17 00:00:00 2001
From: David Spickett <david.spickett at linaro.org>
Date: Mon, 3 Jun 2024 13:51:22 +0000
Subject: [PATCH 2/4] move to test folder

---
 lldb/{ => test}/requirements.txt | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename lldb/{ => test}/requirements.txt (100%)

diff --git a/lldb/requirements.txt b/lldb/test/requirements.txt
similarity index 100%
rename from lldb/requirements.txt
rename to lldb/test/requirements.txt

>From b4c4f0b948970f14c9615df83bbb56befced1d5b Mon Sep 17 00:00:00 2001
From: David Spickett <david.spickett at linaro.org>
Date: Mon, 3 Jun 2024 14:02:52 +0000
Subject: [PATCH 3/4] Add minimum versions

---
 lldb/test/requirements.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lldb/test/requirements.txt b/lldb/test/requirements.txt
index 645004bd3f57c..677d7cef3d571 100644
--- a/lldb/test/requirements.txt
+++ b/lldb/test/requirements.txt
@@ -1,7 +1,7 @@
 # These Python packages are required to be able to run the LLDB test suite.
 
-psutil
+psutil>=5.9.4
 # pexpect is only required on Linux, can be installed on Windows but pexpect
 # tests are automatically skipped there because they are known not to work
 # (llvm.org/pr22274).
-pexpect
+pexpect>=4.9.0

>From 3a0970fc822f74352e540efc9ffc0550415f7f66 Mon Sep 17 00:00:00 2001
From: David Spickett <david.spickett at linaro.org>
Date: Mon, 3 Jun 2024 14:17:38 +0000
Subject: [PATCH 4/4] no pexpect on windows

---
 lldb/test/requirements.txt | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/lldb/test/requirements.txt b/lldb/test/requirements.txt
index 677d7cef3d571..83fbe6a5e1b97 100644
--- a/lldb/test/requirements.txt
+++ b/lldb/test/requirements.txt
@@ -1,7 +1,6 @@
 # These Python packages are required to be able to run the LLDB test suite.
 
 psutil>=5.9.4
-# pexpect is only required on Linux, can be installed on Windows but pexpect
-# tests are automatically skipped there because they are known not to work
-# (llvm.org/pr22274).
-pexpect>=4.9.0
+# Pexpect tests are known not to work on Windows, so are disabled.
+# See llvm.org/pr22274.
+pexpect>=4.9.0; sys_platform != 'win32'