Nemcio/git-remote-hg
1
0
Fork 0
mirror of https://github.com/mnauw/git-remote-hg.git synced 2025-11-02 09:35:47 +01:00
Code Issues Packages Projects Releases Activity

Merge branch 'sharness-output-dir'

Browse Source 
* sharness-output-dir:
  test: sharness: add support for output directory
This commit is contained in:
Felipe Contreras
2019-06-03 14:54:51 -05:00
parent 673b50d3f4 13bbc8a342
commit 5ad322c54d
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
test/sharness.sh
View File

@@ -37,6 +37,13 @@ else
fi fi
export SHARNESS_TEST_DIRECTORY export SHARNESS_TEST_DIRECTORY
if test -z "$SHARNESS_TEST_OUTPUT_DIRECTORY"
then
# Similarly, override this to store the test-results subdir
# elsewhere
SHARNESS_TEST_OUTPUT_DIRECTORY=$SHARNESS_TEST_DIRECTORY
fi
# Reset TERM to original terminal if found, otherwise save original TERM # Reset TERM to original terminal if found, otherwise save original TERM
[ "x" = "x$SHARNESS_ORIG_TERM" ] && [ "x" = "x$SHARNESS_ORIG_TERM" ] &&
SHARNESS_ORIG_TERM="$TERM" || SHARNESS_ORIG_TERM="$TERM" ||
@@ -55,8 +62,8 @@ done,*)
# do not redirect again # do not redirect again
;; ;;
*' --tee '*|*' --verbose-log '*) *' --tee '*|*' --verbose-log '*)
mkdir -p "$SHARNESS_TEST_DIRECTORY/test-results" mkdir -p "$SHARNESS_TEST_OUTPUT_DIRECTORY/test-results"
BASE="$SHARNESS_TEST_DIRECTORY/test-results/$(basename "$0" ".$SHARNESS_TEST_EXTENSION")" BASE="$SHARNESS_TEST_OUTPUT_DIRECTORY/test-results/$(basename "$0" ".$SHARNESS_TEST_EXTENSION")"
# Make this filename available to the sub-process in case it is using # Make this filename available to the sub-process in case it is using
# --verbose-log. # --verbose-log.
@@ -820,7 +827,7 @@ test_done() {
EXIT_OK=t EXIT_OK=t
if test -z "$HARNESS_ACTIVE"; then if test -z "$HARNESS_ACTIVE"; then
test_results_dir="$SHARNESS_TEST_DIRECTORY/test-results" test_results_dir="$SHARNESS_TEST_OUTPUT_DIRECTORY/test-results"
mkdir -p "$test_results_dir" mkdir -p "$test_results_dir"
test_results_path="$test_results_dir/$this_test.$$.counts" test_results_path="$test_results_dir/$this_test.$$.counts"
@@ -899,7 +906,7 @@ SHARNESS_TRASH_DIRECTORY="trash directory.$(basename "$SHARNESS_TEST_FILE" ".$SH
test -n "$root" && SHARNESS_TRASH_DIRECTORY="$root/$SHARNESS_TRASH_DIRECTORY" test -n "$root" && SHARNESS_TRASH_DIRECTORY="$root/$SHARNESS_TRASH_DIRECTORY"
case "$SHARNESS_TRASH_DIRECTORY" in case "$SHARNESS_TRASH_DIRECTORY" in
/*) ;; # absolute path is good /*) ;; # absolute path is good
*) SHARNESS_TRASH_DIRECTORY="$SHARNESS_TEST_DIRECTORY/$SHARNESS_TRASH_DIRECTORY" ;; *) SHARNESS_TRASH_DIRECTORY="$SHARNESS_TEST_OUTPUT_DIRECTORY/$SHARNESS_TRASH_DIRECTORY" ;;
esac esac
test "$debug" = "t" || remove_trash="$SHARNESS_TRASH_DIRECTORY" test "$debug" = "t" || remove_trash="$SHARNESS_TRASH_DIRECTORY"
rm -rf "$SHARNESS_TRASH_DIRECTORY" || { rm -rf "$SHARNESS_TRASH_DIRECTORY" || {