From 327428f2afb90077ecdabb9f25287710eee083f2 Mon Sep 17 00:00:00 2001
From: Viktor Szakats <commit@vsz.me>
Date: Tue, 25 Feb 2025 03:25:22 +0100
Subject: [PATCH] Revert "disable server bundles (temp)"

This reverts commit 8732f9e38f3b3cb0f303316ea032ea8966a98bd1.
---
 configure.ac                | 1 -
 tests/runtests.pl           | 2 +-
 tests/server/CMakeLists.txt | 2 +-
 tests/server/Makefile.am    | 2 +-
 4 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/configure.ac b/configure.ac
index 5bc1f7816b..6146412e74 100644
--- a/configure.ac
+++ b/configure.ac
@@ -663,7 +663,6 @@ AS_HELP_STRING([--disable-test-bundles],[Disable test bundles (default)]),
 )
 
 AM_CONDITIONAL([USE_TEST_BUNDLES], [test "$want_test_bundles" = 'yes'])
-AM_CONDITIONAL([USE_TEST_BUNDLES_SERVER], [test "$want_test_bundles" = 'DISABLED'])
 
 dnl ************************************************************
 dnl switch off particular protocols
diff --git a/tests/runtests.pl b/tests/runtests.pl
index 7af2feec05..f69cf78b43 100755
--- a/tests/runtests.pl
+++ b/tests/runtests.pl
@@ -2255,7 +2255,7 @@ while(@ARGV) {
     elsif ($ARGV[0] eq "-bundle") {
         # use test bundles
         $bundle=1;
-        #$ENV{'CURL_TEST_BUNDLES'} = 1;
+        $ENV{'CURL_TEST_BUNDLES'} = 1;
     }
     elsif ($ARGV[0] eq "-d") {
         # have the servers display protocol output
diff --git a/tests/server/CMakeLists.txt b/tests/server/CMakeLists.txt
index 0dfc881538..3a7e415077 100644
--- a/tests/server/CMakeLists.txt
+++ b/tests/server/CMakeLists.txt
@@ -32,7 +32,7 @@ set_source_files_properties(
   "../../lib/curl_multibyte.c"
   PROPERTIES SKIP_UNITY_BUILD_INCLUSION ON)
 
-if(CURL_TEST_BUNDLES_SERVER)
+if(CURL_TEST_BUNDLES)
   add_custom_command(
     OUTPUT "server_bundle.c"
     COMMAND ${PERL_EXECUTABLE} "${CURL_SOURCE_DIR}/tests/mk-bundle-server.pl" ${SERVERPROGS} > "server_bundle.c"
diff --git a/tests/server/Makefile.am b/tests/server/Makefile.am
index 3bacf7f6c0..e1a9385f8a 100644
--- a/tests/server/Makefile.am
+++ b/tests/server/Makefile.am
@@ -53,7 +53,7 @@ include Makefile.inc
 
 EXTRA_DIST = base64.pl CMakeLists.txt .checksrc
 
-if USE_TEST_BUNDLES_SERVER
+if USE_TEST_BUNDLES
 server_bundle.c: $(top_srcdir)/tests/mk-bundle-server.pl $(CURLX_SRCS) $(USEFUL) $(INET_PTON) $(UTIL) $(UTIL_BUNDLE)
 	@PERL@ $(top_srcdir)/tests/mk-bundle-server.pl $(SERVERPROGS) > server_bundle.c