From ab8abacb91e0a940ecca3218b3a7ab767b44ab21 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakub=20Kul=C3=ADk?= <kulikjak@gmail.com>
Date: Wed, 14 Sep 2022 16:49:42 +0200
Subject: [PATCH 1/2] Fix test_csh when running with the original csh

---
 tests/unit/activation/test_csh.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/tests/unit/activation/test_csh.py b/tests/unit/activation/test_csh.py
index f9539c5af..afdb08f49 100644
--- a/tests/unit/activation/test_csh.py
+++ b/tests/unit/activation/test_csh.py
@@ -7,6 +7,8 @@ def __init__(self, session):
             super().__init__(CShellActivator, session, "csh", "activate.csh", "csh")
 
         def print_prompt(self):
-            return "echo 'source \"$VIRTUAL_ENV/bin/activate.csh\"; echo $prompt' | csh -i"
+            # Original csh doesn't print the last newline,
+            # breaking the test; hence the trailing echo.
+            return "echo 'source \"$VIRTUAL_ENV/bin/activate.csh\"; echo $prompt' | csh -i ; echo"
 
     activation_tester(Csh)

From 1ebbd4feb8a02de6b1d641c165705f02831d542f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakub=20Kul=C3=ADk?= <kulikjak@gmail.com>
Date: Tue, 20 Sep 2022 16:16:13 +0200
Subject: [PATCH 2/2] Add news entry

---
 docs/changelog/2418.bugfix.rst | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 docs/changelog/2418.bugfix.rst

diff --git a/docs/changelog/2418.bugfix.rst b/docs/changelog/2418.bugfix.rst
new file mode 100644
index 000000000..d13c4a2f5
--- /dev/null
+++ b/docs/changelog/2418.bugfix.rst
@@ -0,0 +1 @@
+Allow the test suite to pass even with the original C shell (rather than ``tcsh``) - by :user:`kulikjak`.