From 35d58a92ab2c285b23bb1e6ddb0a2b76bbbdc590 Mon Sep 17 00:00:00 2001
From: Alexey Masterov <alexeymasterov@neon.tech>
Date: Mon, 28 Apr 2025 13:59:33 +0200
Subject: [PATCH] Use patch instead of sed

---
 .../ext-src/postgis-src/neon-test.sh          |  6 ++----
 .../postgis-src/postgis-no-upgrade-test.patch | 21 +++++++++++++++++++
 2 files changed, 23 insertions(+), 4 deletions(-)
 create mode 100644 docker-compose/ext-src/postgis-src/postgis-no-upgrade-test.patch

diff --git a/docker-compose/ext-src/postgis-src/neon-test.sh b/docker-compose/ext-src/postgis-src/neon-test.sh
index 1a9d73cc39..2866649a1b 100755
--- a/docker-compose/ext-src/postgis-src/neon-test.sh
+++ b/docker-compose/ext-src/postgis-src/neon-test.sh
@@ -4,8 +4,6 @@ cd "$(dirname "$0")"
 if [[ ${PG_VERSION} = v17 ]]; then
   sed -i '/computed_columns/d' regress/core/tests.mk
 fi
-TMPDIR=$(mktemp -d /tmp/ext-test-XXXXXX)
-cp regress/runtest.mk "${TMPDIR}"
-sed -i '27,36d' regress/runtest.mk
-trap 'echo Cleaning up; mv "${TMPDIR}/runtest.mk" regress/runtest.mk && rmdir "${TMPDIR}"' EXIT
+patch -p1 <postgis-no-upgrade-test.patch
+trap 'echo Cleaning up; patch -R -p1 <postgis-no-upgrade-test.patch' EXIT
 make installcheck-base
\ No newline at end of file
diff --git a/docker-compose/ext-src/postgis-src/postgis-no-upgrade-test.patch b/docker-compose/ext-src/postgis-src/postgis-no-upgrade-test.patch
new file mode 100644
index 0000000000..560fc77e82
--- /dev/null
+++ b/docker-compose/ext-src/postgis-src/postgis-no-upgrade-test.patch
@@ -0,0 +1,21 @@
+diff --git a/regress/runtest.mk b/regress/runtest.mk
+index c051f03..010e493 100644
+--- a/regress/runtest.mk
++++ b/regress/runtest.mk
+@@ -24,16 +24,6 @@ check-regress:
+ 
+ 	POSTGIS_TOP_BUILD_DIR=$(abs_top_builddir) $(PERL) $(top_srcdir)/regress/run_test.pl $(RUNTESTFLAGS) $(RUNTESTFLAGS_INTERNAL) $(TESTS)
+ 
+-	@if echo "$(RUNTESTFLAGS)" | grep -vq -- --upgrade; then \
+-		echo "Running upgrade test as RUNTESTFLAGS did not contain that"; \
+-		POSTGIS_TOP_BUILD_DIR=$(abs_top_builddir) $(PERL) $(top_srcdir)/regress/run_test.pl \
+-      --upgrade \
+-      $(RUNTESTFLAGS) \
+-      $(RUNTESTFLAGS_INTERNAL) \
+-      $(TESTS); \
+-	else \
+-		echo "Skipping upgrade test as RUNTESTFLAGS already requested upgrades"; \
+-	fi
+ 
+ check-long:
+ 	$(PERL) $(top_srcdir)/regress/run_test.pl $(RUNTESTFLAGS) $(TESTS) $(TESTS_SLOW)