Avoid non-POSIX cp flags

anarazel · anarazel · commit 1a4fd77db85a · 2023-08-25T06:43:37.000-07:00
Commit 252dcb3 used cp -a, but apparently Solaris doesn't like that. Use cp -RPp instead. Author: Thomas Munro <thomas.munro@gmail.com> Reviewed-by: Daniel Gustafsson <daniel@yesql.se> Discussion: https://postgr.es/m/CA+hUKGL10AoQVMMqgOJ8CTjoz9MLidD8ik2e8PibzLNMz0+aRg@mail.gmail.com
diff --git a/src/test/perl/PostgreSQL/Test/Cluster.pm b/src/test/perl/PostgreSQL/Test/Cluster.pm
@@ -549,7 +549,7 @@ sub init
 		}
 		else
 		{
-			@copycmd = qw(cp -a);
+			@copycmd = qw(cp -RPp);
 			$expected_exitcode = 0;
 		}
 
diff --git a/src/test/regress/pg_regress.c b/src/test/regress/pg_regress.c
@@ -2355,7 +2355,7 @@ regression_main(int argc, char *argv[],
 		else
 		{
 #ifndef WIN32
-			const char *copycmd = "cp -a \"%s\" \"%s/data\"";
+			const char *copycmd = "cp -RPp \"%s\" \"%s/data\"";
 			int			expected_exitcode = 0;
 #else
 			const char *copycmd = "robocopy /E /NJS /NJH /NFL /NDL /NP \"%s\" \"%s/data\"";

Original file line number	Diff line number	Diff line change
`@@ -549,7 +549,7 @@ sub init`
`549`	`549`	`}`
`550`	`550`	`else`
`551`	`551`	`{`
`552`		`- @copycmd = qw(cp -a);`
	`552`	`+ @copycmd = qw(cp -RPp);`
`553`	`553`	`$expected_exitcode = 0;`
`554`	`554`	`}`
`555`	`555`
Original file line number	Diff line number	Diff line change
`@@ -2355,7 +2355,7 @@ regression_main(int argc, char *argv[],`
`2355`	`2355`	`else`
`2356`	`2356`	`{`
`2357`	`2357`	`#ifndef WIN32`
`2358`		`- const char *copycmd = "cp -a \"%s\" \"%s/data\"";`
	`2358`	`+ const char *copycmd = "cp -RPp \"%s\" \"%s/data\"";`
`2359`	`2359`	`int expected_exitcode = 0;`
`2360`	`2360`	`#else`
`2361`	`2361`	`const char *copycmd = "robocopy /E /NJS /NJH /NFL /NDL /NP \"%s\" \"%s/data\"";`