Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit0974550

Browse files
author
Michael Paquier
committed
Make regression tests pass on OSX
Diffs were generated because of wc that puts some spaces before theoutput which is in this case a number of lines. This does not impactregression tests on Linux/Unix.
1 parent129b21c commit0974550

File tree

3 files changed

+6
-9
lines changed

3 files changed

+6
-9
lines changed

‎expected/option.out‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,5 +77,4 @@ ERROR: option -Z, --compress-data should be a boolean: 'FOO'
7777
ERROR: option --keep-arclog-files should be a 32bit signed integer: 'YES'
7878
ERROR: invalid option "TIMELINEID"
7979
ERROR: invalid option "BACKUP_TARGETS"
80-
ERROR: invalid backup-mode "F''\F"
8180
ERROR: invalid backup-mode "ENV_PATH"

‎sql/backup_restore.sh‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ fi
182182
echo"diff files in BACKUP_PATH/backup/pg_xlog"
183183
diff -r$PGDATA/pg_xlog$BACKUP_PATH/backup/pg_xlog
184184
echo"# of files in BACKUP_PATH/backup/srvlog"
185-
find$BACKUP_PATH/backup/srvlog -type f| wc -l
185+
find$BACKUP_PATH/backup/srvlog -type f| wc -l| tr -d''
186186

187187
# recovery database
188188
pg_ctl start -w -t 3600> /dev/null2>&1
@@ -205,7 +205,7 @@ fi
205205
echo"diff files in BACKUP_PATH/backup/pg_xlog"
206206
diff -r$PGDATA/pg_xlog$BACKUP_PATH/backup/pg_xlog
207207
echo"# of files in BACKUP_PATH/backup/srvlog"
208-
find$BACKUP_PATH/backup/srvlog -type f| wc -l
208+
find$BACKUP_PATH/backup/srvlog -type f| wc -l| tr -d''
209209

210210
# re-recovery database
211211
pg_ctl start -w -t 3600> /dev/null2>&1
@@ -223,17 +223,17 @@ pg_rman -w -p $TEST_PGPORT backup -b f --verbose -d postgres > $BASE_PATH/result
223223

224224
# Backup of online-WAL should been deleted, but serverlog remain.
225225
echo"# of files in BACKUP_PATH/backup/pg_xlog"
226-
find$BACKUP_PATH/backup/pg_xlog -type f| wc -l
226+
find$BACKUP_PATH/backup/pg_xlog -type f| wc -l| tr -d''
227227
echo"# of files in BACKUP_PATH/backup/srvlog"
228-
find$BACKUP_PATH/backup/srvlog -type f| wc -l
228+
find$BACKUP_PATH/backup/srvlog -type f| wc -l| tr -d''
229229

230230
# Symbolic links in $ARCLOG_PATH should be deleted.
231231
echo"# of symbolic links in ARCLOG_PATH"
232-
find$ARCLOG_PATH -type l| wc -l
232+
find$ARCLOG_PATH -type l| wc -l| tr -d''
233233

234234
# timeline history files are backed up.
235235
echo"# of files in BACKUP_PATH/timeline_history"
236-
find$BACKUP_PATH/timeline_history -type f| wc -l
236+
find$BACKUP_PATH/timeline_history -type f| wc -l| tr -d''
237237

238238
# restore with pg_rman
239239
pg_ctl stop -m immediate> /dev/null2>&1

‎sql/option.sh‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,6 @@ echo "TIMELINEID=-1" > $BACKUP_PATH/pg_rman.ini
6666
pg_rman backup --verbose -B$BACKUP_PATH
6767
echo"BACKUP_TARGETS=F">$BACKUP_PATH/pg_rman.ini
6868
pg_rman backup --verbose -B$BACKUP_PATH
69-
echo"BACKUP_MODE='F''\'\\\F'">$BACKUP_PATH/pg_rman.ini
70-
pg_rman backup --verbose -B$BACKUP_PATH
7169

7270
# configuration priorityfile check
7371
echo"BACKUP_MODE=ENV_PATH">$BACKUP_PATH/pg_rman.ini

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp