Fix a test fail if start-up psqlrc file exists (#179)

ossc-db · May 31, 2021 · 115e9be · 115e9be
1 parent ec0c350
commit 115e9be
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -147,6 +147,10 @@ jobs:
         LOGFILE=~/make.log
         grep -C 1 warning $LOGFILE || exit 0     # ok if warning doesn't exists (= status code is 1)
 
+    - name: make a .psqlrc file because there is a possibility that make installcheck may fail
+      shell: bash -xe {0}
+      run: echo '\\timing' > ~/.psqlrc
+
     - name: make installcheck
       shell: bash -xe {0}
       run: |

diff --git a/sql/backup.sh b/sql/backup.sh
@@ -147,8 +147,8 @@ echo '###### Make sure that pg_rman does not take a differential backup, but a i
 init_catalog
 pg_rman backup -B ${BACKUP_PATH} -b full -p ${TEST_PGPORT} -d postgres --quiet;echo $?
 pg_rman validate -B ${BACKUP_PATH} --quiet
-psql -p ${TEST_PGPORT} -d postgres -c 'create table test (c1 int);'
-psql -p ${TEST_PGPORT} -d postgres -c 'insert into test values(generate_series(1,1000000));' 
+psql --no-psqlrc -p ${TEST_PGPORT} -d postgres -c 'create table test (c1 int);'
+psql --no-psqlrc -p ${TEST_PGPORT} -d postgres -c 'insert into test values(generate_series(1,1000000));'
 pg_rman backup -B ${BACKUP_PATH} -b incremental -p ${TEST_PGPORT} -d postgres --quiet;echo $?
 pg_rman validate -B ${BACKUP_PATH} --quiet
 pg_rman backup -B ${BACKUP_PATH} -b incremental -p ${TEST_PGPORT} -d postgres --quiet;echo $?