|
|
|
@ -100,12 +100,12 @@ unset CDPATH
@@ -100,12 +100,12 @@ unset CDPATH
|
|
|
|
|
unset GREP_OPTIONS |
|
|
|
|
|
|
|
|
|
case $(echo $GIT_TRACE |tr "[A-Z]" "[a-z]") in |
|
|
|
|
1|2|true) |
|
|
|
|
echo "* warning: Some tests will not work if GIT_TRACE" \ |
|
|
|
|
"is set as to trace on STDERR ! *" |
|
|
|
|
echo "* warning: Please set GIT_TRACE to something" \ |
|
|
|
|
"other than 1, 2 or true ! *" |
|
|
|
|
;; |
|
|
|
|
1|2|true) |
|
|
|
|
echo "* warning: Some tests will not work if GIT_TRACE" \ |
|
|
|
|
"is set as to trace on STDERR ! *" |
|
|
|
|
echo "* warning: Please set GIT_TRACE to something" \ |
|
|
|
|
"other than 1, 2 or true ! *" |
|
|
|
|
;; |
|
|
|
|
esac |
|
|
|
|
|
|
|
|
|
# Convenience |
|
|
|
@ -172,17 +172,23 @@ do
@@ -172,17 +172,23 @@ do
|
|
|
|
|
esac |
|
|
|
|
done |
|
|
|
|
|
|
|
|
|
if test -n "$color"; then |
|
|
|
|
if test -n "$color" |
|
|
|
|
then |
|
|
|
|
say_color () { |
|
|
|
|
( |
|
|
|
|
TERM=$ORIGINAL_TERM |
|
|
|
|
export TERM |
|
|
|
|
case "$1" in |
|
|
|
|
error) tput bold; tput setaf 1;; # bold red |
|
|
|
|
skip) tput bold; tput setaf 2;; # bold green |
|
|
|
|
pass) tput setaf 2;; # green |
|
|
|
|
info) tput setaf 3;; # brown |
|
|
|
|
*) test -n "$quiet" && return;; |
|
|
|
|
error) |
|
|
|
|
tput bold; tput setaf 1;; # bold red |
|
|
|
|
skip) |
|
|
|
|
tput bold; tput setaf 2;; # bold green |
|
|
|
|
pass) |
|
|
|
|
tput setaf 2;; # green |
|
|
|
|
info) |
|
|
|
|
tput setaf 3;; # brown |
|
|
|
|
*) |
|
|
|
|
test -n "$quiet" && return;; |
|
|
|
|
esac |
|
|
|
|
shift |
|
|
|
|
printf "%s" "$*" |
|
|
|
@ -298,7 +304,8 @@ test_run_ () {
@@ -298,7 +304,8 @@ test_run_ () {
|
|
|
|
|
then |
|
|
|
|
test_eval_ "$test_cleanup" |
|
|
|
|
fi |
|
|
|
|
if test "$verbose" = "t" && test -n "$HARNESS_ACTIVE"; then |
|
|
|
|
if test "$verbose" = "t" && test -n "$HARNESS_ACTIVE" |
|
|
|
|
then |
|
|
|
|
echo "" |
|
|
|
|
fi |
|
|
|
|
return "$eval_ret" |
|
|
|
@ -346,7 +353,8 @@ test_at_end_hook_ () {
@@ -346,7 +353,8 @@ test_at_end_hook_ () {
|
|
|
|
|
test_done () { |
|
|
|
|
GIT_EXIT_OK=t |
|
|
|
|
|
|
|
|
|
if test -z "$HARNESS_ACTIVE"; then |
|
|
|
|
if test -z "$HARNESS_ACTIVE" |
|
|
|
|
then |
|
|
|
|
test_results_dir="$TEST_OUTPUT_DIRECTORY/test-results" |
|
|
|
|
mkdir -p "$test_results_dir" |
|
|
|
|
test_results_path="$test_results_dir/${0%.sh}-$$.counts" |
|
|
|
@ -377,7 +385,8 @@ test_done () {
@@ -377,7 +385,8 @@ test_done () {
|
|
|
|
|
# Maybe print SKIP message |
|
|
|
|
[ -z "$skip_all" ] || skip_all=" # SKIP $skip_all" |
|
|
|
|
|
|
|
|
|
if test $test_external_has_tap -eq 0; then |
|
|
|
|
if test $test_external_has_tap -eq 0 |
|
|
|
|
then |
|
|
|
|
say_color pass "# passed all $msg" |
|
|
|
|
say "1..$test_count$skip_all" |
|
|
|
|
fi |
|
|
|
@ -391,7 +400,8 @@ test_done () {
@@ -391,7 +400,8 @@ test_done () {
|
|
|
|
|
exit 0 ;; |
|
|
|
|
|
|
|
|
|
*) |
|
|
|
|
if test $test_external_has_tap -eq 0; then |
|
|
|
|
if test $test_external_has_tap -eq 0 |
|
|
|
|
then |
|
|
|
|
say_color error "# failed $test_failure among $msg" |
|
|
|
|
say "1..$test_count" |
|
|
|
|
fi |
|
|
|
@ -471,22 +481,26 @@ then
@@ -471,22 +481,26 @@ then
|
|
|
|
|
PATH=$GIT_VALGRIND/bin:$PATH |
|
|
|
|
GIT_EXEC_PATH=$GIT_VALGRIND/bin |
|
|
|
|
export GIT_VALGRIND |
|
|
|
|
elif test -n "$GIT_TEST_INSTALLED" ; then |
|
|
|
|
elif test -n "$GIT_TEST_INSTALLED" |
|
|
|
|
then |
|
|
|
|
GIT_EXEC_PATH=$($GIT_TEST_INSTALLED/git --exec-path) || |
|
|
|
|
error "Cannot run git from $GIT_TEST_INSTALLED." |
|
|
|
|
PATH=$GIT_TEST_INSTALLED:$GIT_BUILD_DIR:$PATH |
|
|
|
|
GIT_EXEC_PATH=${GIT_TEST_EXEC_PATH:-$GIT_EXEC_PATH} |
|
|
|
|
else # normal case, use ../bin-wrappers only unless $with_dashes: |
|
|
|
|
git_bin_dir="$GIT_BUILD_DIR/bin-wrappers" |
|
|
|
|
if ! test -x "$git_bin_dir/git" ; then |
|
|
|
|
if test -z "$with_dashes" ; then |
|
|
|
|
if ! test -x "$git_bin_dir/git" |
|
|
|
|
then |
|
|
|
|
if test -z "$with_dashes" |
|
|
|
|
then |
|
|
|
|
say "$git_bin_dir/git is not executable; using GIT_EXEC_PATH" |
|
|
|
|
fi |
|
|
|
|
with_dashes=t |
|
|
|
|
fi |
|
|
|
|
PATH="$git_bin_dir:$PATH" |
|
|
|
|
GIT_EXEC_PATH=$GIT_BUILD_DIR |
|
|
|
|
if test -n "$with_dashes" ; then |
|
|
|
|
if test -n "$with_dashes" |
|
|
|
|
then |
|
|
|
|
PATH="$GIT_BUILD_DIR:$PATH" |
|
|
|
|
fi |
|
|
|
|
fi |
|
|
|
@ -521,7 +535,8 @@ then
@@ -521,7 +535,8 @@ then
|
|
|
|
|
} |
|
|
|
|
fi |
|
|
|
|
|
|
|
|
|
if ! test -x "$GIT_BUILD_DIR"/test-chmtime; then |
|
|
|
|
if ! test -x "$GIT_BUILD_DIR"/test-chmtime |
|
|
|
|
then |
|
|
|
|
echo >&2 'You need to build test-chmtime:' |
|
|
|
|
echo >&2 'Run "make test-chmtime" in the source (toplevel) directory' |
|
|
|
|
exit 1 |
|
|
|
@ -544,7 +559,8 @@ rm -fr "$test" || {
@@ -544,7 +559,8 @@ rm -fr "$test" || {
|
|
|
|
|
HOME="$TRASH_DIRECTORY" |
|
|
|
|
export HOME |
|
|
|
|
|
|
|
|
|
if test -z "$TEST_NO_CREATE_REPO"; then |
|
|
|
|
if test -z "$TEST_NO_CREATE_REPO" |
|
|
|
|
then |
|
|
|
|
test_create_repo "$test" |
|
|
|
|
else |
|
|
|
|
mkdir -p "$test" |
|
|
|
|