{"thread":{"id":"31410","subject":"[PATCH 4/6] test-lib.sh: Fix some shell coding style violations","startedAt":"2012-09-01T18:11:49Z","lastAt":"2012-09-01T18:11:49Z","messageCount":1,"participants":["Ramsay Jones"],"isPatch":true,"patchVersion":1,"patchTotal":6},"messages":[{"id":"198203","messageId":"50424FE5.4010301@ramsay1.demon.co.uk","threadId":"31410","inReplyTo":null,"subject":"[PATCH 4/6] test-lib.sh: Fix some shell coding style violations","fromName":"Ramsay Jones","fromEmail":"ramsay@ramsay1.demon.co.uk","sentAt":"2012-09-01T18:11:49Z","receivedAt":"2012-09-01T18:11:49Z","isPatch":true,"sender":{"key":"ramsay@ramsayjones.plus.com","avatar":"https://avatars.githubusercontent.com/u/33702710?v=4"},"body":"\n\nSigned-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk>\n---\n t/test-lib.sh | 60 +++++++++++++++++++++++++++++++++++++----------------------\n 1 file changed, 38 insertions(+), 22 deletions(-)\n\ndiff --git a/t/test-lib.sh b/t/test-lib.sh\nindex 78c4286..56b028c 100644\n--- a/t/test-lib.sh\n+++ b/t/test-lib.sh\n@@ -100,12 +100,12 @@ unset CDPATH\n unset GREP_OPTIONS\n \n case $(echo $GIT_TRACE |tr \"[A-Z]\" \"[a-z]\") in\n-\t1|2|true)\n-\t\techo \"* warning: Some tests will not work if GIT_TRACE\" \\\n-\t\t\t\"is set as to trace on STDERR ! *\"\n-\t\techo \"* warning: Please set GIT_TRACE to something\" \\\n-\t\t\t\"other than 1, 2 or true ! *\"\n-\t\t;;\n+1|2|true)\n+\techo \"* warning: Some tests will not work if GIT_TRACE\" \\\n+\t\t\"is set as to trace on STDERR ! *\"\n+\techo \"* warning: Please set GIT_TRACE to something\" \\\n+\t\t\"other than 1, 2 or true ! *\"\n+\t;;\n esac\n \n # Convenience\n@@ -172,17 +172,23 @@ do\n \tesac\n done\n \n-if test -n \"$color\"; then\n+if test -n \"$color\"\n+then\n \tsay_color () {\n \t\t(\n \t\tTERM=$ORIGINAL_TERM\n \t\texport TERM\n \t\tcase \"$1\" in\n-\t\t\terror) tput bold; tput setaf 1;; # bold red\n-\t\t\tskip)  tput bold; tput setaf 2;; # bold green\n-\t\t\tpass)  tput setaf 2;;            # green\n-\t\t\tinfo)  tput setaf 3;;            # brown\n-\t\t\t*) test -n \"$quiet\" && return;;\n+\t\terror)\n+\t\t\ttput bold; tput setaf 1;; # bold red\n+\t\tskip)\n+\t\t\ttput bold; tput setaf 2;; # bold green\n+\t\tpass)\n+\t\t\ttput setaf 2;;            # green\n+\t\tinfo)\n+\t\t\ttput setaf 3;;            # brown\n+\t\t*)\n+\t\t\ttest -n \"$quiet\" && return;;\n \t\tesac\n \t\tshift\n \t\tprintf \"%s\" \"$*\"\n@@ -298,7 +304,8 @@ test_run_ () {\n \tthen\n \t\ttest_eval_ \"$test_cleanup\"\n \tfi\n-\tif test \"$verbose\" = \"t\" && test -n \"$HARNESS_ACTIVE\"; then\n+\tif test \"$verbose\" = \"t\" && test -n \"$HARNESS_ACTIVE\"\n+\tthen\n \t\techo \"\"\n \tfi\n \treturn \"$eval_ret\"\n@@ -346,7 +353,8 @@ test_at_end_hook_ () {\n test_done () {\n \tGIT_EXIT_OK=t\n \n-\tif test -z \"$HARNESS_ACTIVE\"; then\n+\tif test -z \"$HARNESS_ACTIVE\"\n+\tthen\n \t\ttest_results_dir=\"$TEST_OUTPUT_DIRECTORY/test-results\"\n \t\tmkdir -p \"$test_results_dir\"\n \t\ttest_results_path=\"$test_results_dir/${0%.sh}-$$.counts\"\n@@ -377,7 +385,8 @@ test_done () {\n \t\t# Maybe print SKIP message\n \t\t[ -z \"$skip_all\" ] || skip_all=\" # SKIP $skip_all\"\n \n-\t\tif test $test_external_has_tap -eq 0; then\n+\t\tif test $test_external_has_tap -eq 0\n+\t\tthen\n \t\t\tsay_color pass \"# passed all $msg\"\n \t\t\tsay \"1..$test_count$skip_all\"\n \t\tfi\n@@ -391,7 +400,8 @@ test_done () {\n \t\texit 0 ;;\n \n \t*)\n-\t\tif test $test_external_has_tap -eq 0; then\n+\t\tif test $test_external_has_tap -eq 0\n+\t\tthen\n \t\t\tsay_color error \"# failed $test_failure among $msg\"\n \t\t\tsay \"1..$test_count\"\n \t\tfi\n@@ -471,22 +481,26 @@ then\n \tPATH=$GIT_VALGRIND/bin:$PATH\n \tGIT_EXEC_PATH=$GIT_VALGRIND/bin\n \texport GIT_VALGRIND\n-elif test -n \"$GIT_TEST_INSTALLED\" ; then\n+elif test -n \"$GIT_TEST_INSTALLED\"\n+then\n \tGIT_EXEC_PATH=$($GIT_TEST_INSTALLED/git --exec-path)  ||\n \terror \"Cannot run git from $GIT_TEST_INSTALLED.\"\n \tPATH=$GIT_TEST_INSTALLED:$GIT_BUILD_DIR:$PATH\n \tGIT_EXEC_PATH=${GIT_TEST_EXEC_PATH:-$GIT_EXEC_PATH}\n else # normal case, use ../bin-wrappers only unless $with_dashes:\n \tgit_bin_dir=\"$GIT_BUILD_DIR/bin-wrappers\"\n-\tif ! test -x \"$git_bin_dir/git\" ; then\n-\t\tif test -z \"$with_dashes\" ; then\n+\tif ! test -x \"$git_bin_dir/git\"\n+\tthen\n+\t\tif test -z \"$with_dashes\"\n+\t\tthen\n \t\t\tsay \"$git_bin_dir/git is not executable; using GIT_EXEC_PATH\"\n \t\tfi\n \t\twith_dashes=t\n \tfi\n \tPATH=\"$git_bin_dir:$PATH\"\n \tGIT_EXEC_PATH=$GIT_BUILD_DIR\n-\tif test -n \"$with_dashes\" ; then\n+\tif test -n \"$with_dashes\"\n+\tthen\n \t\tPATH=\"$GIT_BUILD_DIR:$PATH\"\n \tfi\n fi\n@@ -521,7 +535,8 @@ then\n \t}\n fi\n \n-if ! test -x \"$GIT_BUILD_DIR\"/test-chmtime; then\n+if ! test -x \"$GIT_BUILD_DIR\"/test-chmtime\n+then\n \techo >&2 'You need to build test-chmtime:'\n \techo >&2 'Run \"make test-chmtime\" in the source (toplevel) directory'\n \texit 1\n@@ -544,7 +559,8 @@ rm -fr \"$test\" || {\n HOME=\"$TRASH_DIRECTORY\"\n export HOME\n \n-if test -z \"$TEST_NO_CREATE_REPO\"; then\n+if test -z \"$TEST_NO_CREATE_REPO\"\n+then\n \ttest_create_repo \"$test\"\n else\n \tmkdir -p \"$test\"\n-- \n1.7.12\n"}]}