From 07ef97ea6ed12e5138734f4f68c477e3fd8214d1 Mon Sep 17 00:00:00 2001
From: "Mikhail A. Kulagin" <m.kulagin@postgrespro.ru>
Date: Tue, 12 Apr 2022 10:02:17 +0300
Subject: [PATCH] =?UTF-8?q?Fix=20incorrect=20PG=5FPROBACKUP=5FPTRACK=20def?=
 =?UTF-8?q?inition=20in=20travis=20tests=20(led=20to=20the=20inability=20t?=
 =?UTF-8?q?o=20run=20ptra=D1=81k=20tests)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .travis.yml               | 24 ++++++++++++------------
 travis/make_dockerfile.sh |  2 +-
 travis/run_tests.sh       | 12 ++++++------
 3 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 876289e8..18737e3b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -34,18 +34,18 @@ env:
     - PG_VERSION=10 PG_BRANCH=REL_10_STABLE
     - PG_VERSION=9.6 PG_BRANCH=REL9_6_STABLE
     - PG_VERSION=9.5 PG_BRANCH=REL9_5_STABLE
-#    - PG_VERSION=13 PG_BRANCH=REL_13_STABLE PTRACK_PATCH_PG_BRANCH=off MODE=archive
-#    - PG_VERSION=13 PG_BRANCH=REL_13_STABLE PTRACK_PATCH_PG_BRANCH=REL_13_STABLE MODE=backup
-#    - PG_VERSION=13 PG_BRANCH=REL_13_STABLE PTRACK_PATCH_PG_BRANCH=REL_13_STABLE MODE=catchup
-#    - PG_VERSION=13 PG_BRANCH=REL_13_STABLE PTRACK_PATCH_PG_BRANCH=off MODE=compression
-#    - PG_VERSION=13 PG_BRANCH=REL_13_STABLE PTRACK_PATCH_PG_BRANCH=off MODE=delta
-#    - PG_VERSION=13 PG_BRANCH=REL_13_STABLE PTRACK_PATCH_PG_BRANCH=off MODE=locking
-#    - PG_VERSION=13 PG_BRANCH=REL_13_STABLE PTRACK_PATCH_PG_BRANCH=REL_13_STABLE MODE=merge
-#    - PG_VERSION=13 PG_BRANCH=REL_13_STABLE PTRACK_PATCH_PG_BRANCH=off MODE=page
-#    - PG_VERSION=13 PG_BRANCH=REL_13_STABLE PTRACK_PATCH_PG_BRANCH=REL_13_STABLE MODE=ptrack
-#    - PG_VERSION=13 PG_BRANCH=REL_13_STABLE PTRACK_PATCH_PG_BRANCH=REL_13_STABLE MODE=replica
-#    - PG_VERSION=13 PG_BRANCH=REL_13_STABLE PTRACK_PATCH_PG_BRANCH=off MODE=retention
-#    - PG_VERSION=13 PG_BRANCH=REL_13_STABLE PTRACK_PATCH_PG_BRANCH=REL_13_STABLE MODE=restore
+    - PG_VERSION=13 PG_BRANCH=REL_13_STABLE PTRACK_PATCH_PG_BRANCH=OFF MODE=archive
+    - PG_VERSION=13 PG_BRANCH=REL_13_STABLE PTRACK_PATCH_PG_BRANCH=REL_13_STABLE MODE=backup
+    - PG_VERSION=13 PG_BRANCH=REL_13_STABLE PTRACK_PATCH_PG_BRANCH=REL_13_STABLE MODE=catchup
+    - PG_VERSION=13 PG_BRANCH=REL_13_STABLE PTRACK_PATCH_PG_BRANCH=OFF MODE=compression
+    - PG_VERSION=13 PG_BRANCH=REL_13_STABLE PTRACK_PATCH_PG_BRANCH=OFF MODE=delta
+    - PG_VERSION=13 PG_BRANCH=REL_13_STABLE PTRACK_PATCH_PG_BRANCH=OFF MODE=locking
+    - PG_VERSION=13 PG_BRANCH=REL_13_STABLE PTRACK_PATCH_PG_BRANCH=REL_13_STABLE MODE=merge
+    - PG_VERSION=13 PG_BRANCH=REL_13_STABLE PTRACK_PATCH_PG_BRANCH=OFF MODE=page
+    - PG_VERSION=13 PG_BRANCH=REL_13_STABLE PTRACK_PATCH_PG_BRANCH=REL_13_STABLE MODE=ptrack
+    - PG_VERSION=13 PG_BRANCH=REL_13_STABLE PTRACK_PATCH_PG_BRANCH=REL_13_STABLE MODE=replica
+    - PG_VERSION=13 PG_BRANCH=REL_13_STABLE PTRACK_PATCH_PG_BRANCH=OFF MODE=retention
+    - PG_VERSION=13 PG_BRANCH=REL_13_STABLE PTRACK_PATCH_PG_BRANCH=REL_13_STABLE MODE=restore
 
 jobs:
     allow_failures:
diff --git a/travis/make_dockerfile.sh b/travis/make_dockerfile.sh
index 119125ce..e780649d 100755
--- a/travis/make_dockerfile.sh
+++ b/travis/make_dockerfile.sh
@@ -15,7 +15,7 @@ if [ -z ${MODE+x} ]; then
 fi
 
 if [ -z ${PTRACK_PATCH_PG_BRANCH+x} ]; then
-	PTRACK_PATCH_PG_BRANCH=off
+	PTRACK_PATCH_PG_BRANCH=OFF
 fi
 
 if [ -z ${PGPROBACKUP_GDB+x} ]; then
diff --git a/travis/run_tests.sh b/travis/run_tests.sh
index 44815407..52b05105 100755
--- a/travis/run_tests.sh
+++ b/travis/run_tests.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 #
-# Copyright (c) 2019-2020, Postgres Professional
+# Copyright (c) 2019-2022, Postgres Professional
 #
 set -xe
 
@@ -33,18 +33,18 @@ echo "############### Getting Postgres sources:"
 git clone https://github.com/postgres/postgres.git -b $PG_BRANCH --depth=1
 
 # Clone ptrack
-if [ "$PTRACK_PATCH_PG_BRANCH" != "off" ]; then
+if [ "$PTRACK_PATCH_PG_BRANCH" != "OFF" ]; then
     git clone https://github.com/postgrespro/ptrack.git -b master --depth=1
-    export PG_PROBACKUP_PTRACK=on
+    export PG_PROBACKUP_PTRACK=ON
 else
-    export PG_PROBACKUP_PTRACK=off
+    export PG_PROBACKUP_PTRACK=OFF
 fi
 
 
 # Compile and install Postgres
 echo "############### Compiling Postgres:"
 cd postgres # Go to postgres dir
-if [ "$PG_PROBACKUP_PTRACK" = "on" ]; then
+if [ "$PG_PROBACKUP_PTRACK" = "ON" ]; then
     git apply -3 ../ptrack/patches/${PTRACK_PATCH_PG_BRANCH}-ptrack-core.diff
 fi
 CFLAGS="-O0" ./configure --prefix=$PGHOME --enable-debug --enable-cassert --enable-depend --enable-tap-tests
@@ -59,7 +59,7 @@ export PATH=$PGHOME/bin:$PATH
 export LD_LIBRARY_PATH=$PGHOME/lib
 export PG_CONFIG=$(which pg_config)
 
-if [ "$PG_PROBACKUP_PTRACK" = "on" ]; then
+if [ "$PG_PROBACKUP_PTRACK" = "ON" ]; then
     echo "############### Compiling Ptrack:"
     make USE_PGXS=1 -C ../ptrack install
 fi