From 6ddb951c2ee80583fe0a1a2f6b883d012683d5c6 Mon Sep 17 00:00:00 2001
From: Joe Orton <jorton@redhat.com>
Date: Tue, 19 May 2026 14:49:48 +0100
Subject: [PATCH 1/3] Add Apache-Test as a git submodule.

---
 .gitmodules | 3 +++
 Apache-Test | 1 +
 2 files changed, 4 insertions(+)
 create mode 100644 .gitmodules
 create mode 160000 Apache-Test

diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 00000000..7af4fbb4
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "Apache-Test"]
+	path = Apache-Test
+	url = https://github.com/apache/perl-apache-test
diff --git a/Apache-Test b/Apache-Test
new file mode 160000
index 00000000..ed33bc92
--- /dev/null
+++ b/Apache-Test
@@ -0,0 +1 @@
+Subproject commit ed33bc9265f494ae2fd099a7653da5aa6e173b4d

From f9d1b572a7b29b97068b009cde0b671bc38b1f25 Mon Sep 17 00:00:00 2001
From: Joe Orton <jorton@redhat.com>
Date: Tue, 19 May 2026 14:50:58 +0100
Subject: [PATCH 2/3] CI: Use submodules with actions/checkout, and don't pull
 Apache::Test in via CPAN.

---
 .github/workflows/httpd-build.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/httpd-build.yml b/.github/workflows/httpd-build.yml
index 16f08582..5bd589a3 100644
--- a/.github/workflows/httpd-build.yml
+++ b/.github/workflows/httpd-build.yml
@@ -35,6 +35,8 @@ jobs:
 
     steps:
       - uses: actions/checkout@v4
+        with:
+          submodules: recursive
       - name: Checkout httpd ${{ matrix.branch }}
         uses: actions/checkout@v4
         with:
@@ -57,7 +59,7 @@ jobs:
           cpanm --notest Net::SSL LWP::Protocol::https \
                          LWP::Protocol::AnyEvent::http ExtUtils::Embed Test::More \
                          AnyEvent DateTime HTTP::DAV FCGI \
-                         AnyEvent::WebSocket::Client Apache::Test
+                         AnyEvent::WebSocket::Client
 
       - name: Build httpd
         working-directory: httpd

From 10a9009c838330d8bb3be526a7258dc4562b79a0 Mon Sep 17 00:00:00 2001
From: Joe Orton <jorton@redhat.com>
Date: Thu, 21 May 2026 11:42:54 +0100
Subject: [PATCH 3/3] Tweak README to encourage use of submodules.

---
 README.md | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index 13ae6508..1b6ccbf2 100644
--- a/README.md
+++ b/README.md
@@ -49,15 +49,19 @@ cpanm --quiet --showdeps  Bundle::ApacheTest|grep -v Crypt::SSLeay|xargs cpanm
 
 If you don't care how it works and just want to run the tests:
 
-1. You need an installation of Apache (2.4.x thru trunk).
-2. Any DSOs you wish to use should be configured in that Apache's
-   `httpd.conf` (the test harness will pick this configuration up).
-3. Setup:
+1. Clone this repository:
+   ```bash
+   git clone --recurse-submodule https://github.com/apache/httpd-tests
    ```
+2. You need an installation of Apache httpd (2.4.x or trunk).
+3. Any DSOs you wish to use should be configured in that Apache's
+   `httpd.conf` (the test harness will pick this configuration up).
+4. Setup:
+   ```bash
    perl Makefile.PL -apxs /path/to/apache/bin/apxs
    ```
-4. Run the tests:
-   ```
+5. Run the tests:
+   ```bash
    t/TEST
    ```
 5. Evaluate test output.