diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/backend/replication/basebackup.c | 4 | ||||
| -rw-r--r-- | src/bin/pg_basebackup/t/010_pg_basebackup.pl | 16 | ||||
| -rw-r--r-- | src/bin/pg_checksums/pg_checksums.c | 4 | ||||
| -rw-r--r-- | src/bin/pg_checksums/t/002_actions.pl | 7 | ||||
| -rw-r--r-- | src/bin/pg_rewind/filemap.c | 4 | ||||
| -rw-r--r-- | src/bin/pg_rewind/t/003_extrafiles.pl | 5 |
6 files changed, 0 insertions, 40 deletions
diff --git a/src/backend/replication/basebackup.c b/src/backend/replication/basebackup.c index 7ed82a76ff8..d142cc21319 100644 --- a/src/backend/replication/basebackup.c +++ b/src/backend/replication/basebackup.c @@ -1272,10 +1272,6 @@ sendDir(const char *path, int basepathlen, bool sizeonly, List *tablespaces, strlen(PG_TEMP_FILE_PREFIX)) == 0) continue; - /* Skip macOS system files */ - if (strcmp(de->d_name, ".DS_Store") == 0) - continue; - /* * Check if the postmaster has signaled us to exit, and abort with an * error in that case. The error handler further up will call diff --git a/src/bin/pg_basebackup/t/010_pg_basebackup.pl b/src/bin/pg_basebackup/t/010_pg_basebackup.pl index 43d18fe4ccf..e23ac607aae 100644 --- a/src/bin/pg_basebackup/t/010_pg_basebackup.pl +++ b/src/bin/pg_basebackup/t/010_pg_basebackup.pl @@ -76,16 +76,6 @@ foreach my $filename ( close $file; } -# Test that macOS system files are skipped. Only test on non-macOS systems -# however since creating incorrect .DS_Store files on a macOS system may have -# unintended side effects. -if ($Config{osname} ne 'darwin') -{ - open my $file, '>>', "$pgdata/.DS_Store"; - print $file "DONOTCOPY"; - close $file; -} - # Connect to a database to create global/pg_internal.init. If this is removed # the test to ensure global/pg_internal.init is not copied will return a false # positive. @@ -154,12 +144,6 @@ foreach my $filename ( ok(!-f "$tempdir/backup/$filename", "$filename not copied"); } -# We only test .DS_Store files being skipped on non-macOS systems -if ($Config{osname} ne 'darwin') -{ - ok(!-f "$tempdir/backup/.DS_Store", ".DS_Store not copied"); -} - # Unlogged relation forks other than init should not be copied ok(-f "$tempdir/backup/${baseUnloggedPath}_init", 'unlogged init fork in backup'); diff --git a/src/bin/pg_checksums/pg_checksums.c b/src/bin/pg_checksums/pg_checksums.c index b97d0f32903..831cf42d3ad 100644 --- a/src/bin/pg_checksums/pg_checksums.c +++ b/src/bin/pg_checksums/pg_checksums.c @@ -338,10 +338,6 @@ scan_directory(const char *basedir, const char *subdir, bool sizeonly) strlen(PG_TEMP_FILES_DIR)) == 0) continue; - /* Skip macOS system files */ - if (strcmp(de->d_name, ".DS_Store") == 0) - continue; - snprintf(fn, sizeof(fn), "%s/%s", path, de->d_name); if (lstat(fn, &st) < 0) { diff --git a/src/bin/pg_checksums/t/002_actions.pl b/src/bin/pg_checksums/t/002_actions.pl index a8ced3b4bed..761f7ab53b6 100644 --- a/src/bin/pg_checksums/t/002_actions.pl +++ b/src/bin/pg_checksums/t/002_actions.pl @@ -6,7 +6,6 @@ use strict; use warnings; -use Config; use PostgresNode; use TestLib; @@ -115,12 +114,6 @@ append_to_file "$pgdata/global/pgsql_tmp/1.1", "foo"; append_to_file "$pgdata/global/pg_internal.init", "foo"; append_to_file "$pgdata/global/pg_internal.init.123", "foo"; -# These are non-postgres macOS files, which should be ignored by the scan. -# Only perform this test on non-macOS systems though as creating incorrect -# system files may have side effects on macOS. -append_to_file "$pgdata/global/.DS_Store", "foo" - unless ($Config{osname} eq 'darwin'); - # Enable checksums. command_ok([ 'pg_checksums', '--enable', '--no-sync', '-D', $pgdata ], "checksums successfully enabled in cluster"); diff --git a/src/bin/pg_rewind/filemap.c b/src/bin/pg_rewind/filemap.c index f3ce4f68288..2618b4c957b 100644 --- a/src/bin/pg_rewind/filemap.c +++ b/src/bin/pg_rewind/filemap.c @@ -648,10 +648,6 @@ decide_file_action(file_entry_t *entry) if (strcmp(path, "global/pg_control") == 0) return FILE_ACTION_NONE; - /* Skip macOS system files */ - if (strstr(path, ".DS_Store") != NULL) - return FILE_ACTION_NONE; - /* * Remove all files matching the exclusion filters in the target. */ diff --git a/src/bin/pg_rewind/t/003_extrafiles.pl b/src/bin/pg_rewind/t/003_extrafiles.pl index be60ecaaee4..baea3836b6f 100644 --- a/src/bin/pg_rewind/t/003_extrafiles.pl +++ b/src/bin/pg_rewind/t/003_extrafiles.pl @@ -5,7 +5,6 @@ use strict; use warnings; -use Config; use TestLib; use Test::More tests => 5; @@ -54,10 +53,6 @@ sub run_test append_to_file "$test_standby_datadir/tst_standby_dir/standby_subdir/standby_file4", "in standby4"; - # Skip testing .DS_Store files on macOS to avoid risk of side effects - append_to_file - "$test_standby_datadir/tst_standby_dir/.DS_Store", - "macOS system file" unless ($Config{osname} eq 'darwin'); mkdir "$test_primary_datadir/tst_primary_dir"; append_to_file "$test_primary_datadir/tst_primary_dir/primary_file1", |