From ed4bcf3e4681a5002b50d8fc165ba7af0be4035c Mon Sep 17 00:00:00 2001 From: David Steele Date: Sat, 12 Jul 2014 19:36:12 -0400 Subject: [PATCH] Whitespace is now cleaned in test.pl --- conf/pg_backrest.conf.sample | 2 +- test/test.pl | 4 +++- util/clean.sh | 2 -- util/clean_trailing_whitespace.sh | 1 - 4 files changed, 4 insertions(+), 5 deletions(-) delete mode 100755 util/clean.sh delete mode 100755 util/clean_trailing_whitespace.sh diff --git a/conf/pg_backrest.conf.sample b/conf/pg_backrest.conf.sample index 18059a005..78ca0f5b6 100644 --- a/conf/pg_backrest.conf.sample +++ b/conf/pg_backrest.conf.sample @@ -31,4 +31,4 @@ psql_options=--cluster=9.3/main path=/Users/dsteele/test/db/common [db:command:option] -psql=--port=6001 \ No newline at end of file +psql=--port=6001 diff --git a/test/test.pl b/test/test.pl index 6ddd5ffbd..005f432c7 100755 --- a/test/test.pl +++ b/test/test.pl @@ -61,7 +61,9 @@ BackRestTestCommon_Setup(); #################################################################################################################################### # Clean whitespace #################################################################################################################################### -# find .. -not \( -path ../.git -prune \) -not \( -path ../test/test -prune \) -not \( -iname ".DS_Store" \) +BackRestTestCommon_Execute("find .. -type f -not -path \"../.git/*\" -not -path \"*.DS_Store\" " . + "-exec sh -c 'for i;do echo \"\$i\" && sed 's/[[:space:]]*\$//' \"\$i\">/tmp/.\$\$ && cat /tmp/.\$\$ " . + "> \"\$i\";done' arg0 {} + > /dev/null"); #################################################################################################################################### # Make sure version number matches in README.md and VERSION diff --git a/util/clean.sh b/util/clean.sh deleted file mode 100755 index d86593355..000000000 --- a/util/clean.sh +++ /dev/null @@ -1,2 +0,0 @@ -util/clean_trailing_whitespace.sh . \*.pm -util/clean_trailing_whitespace.sh . \*.pl diff --git a/util/clean_trailing_whitespace.sh b/util/clean_trailing_whitespace.sh deleted file mode 100755 index bf2a7cc89..000000000 --- a/util/clean_trailing_whitespace.sh +++ /dev/null @@ -1 +0,0 @@ -find $1 -type f -name "$2" -exec sh -c 'for i;do echo "$i" && sed 's/[[:space:]]*$//' "$i">/tmp/.$$ && cat /tmp/.$$ > "$i";done' arg0 {} +