From: larsxschneider@gmail.com
To: git@vger.kernel.org
Cc: Lars Schneider <larsxschneider@gmail.com>
Subject: [PATCH v1 3/3] travis-ci: run Git bisect on failed tests
Date: Sun, 22 May 2016 13:00:56 +0200 [thread overview]
Message-ID: <1463914856-64745-4-git-send-email-larsxschneider@gmail.com> (raw)
In-Reply-To: <1463914856-64745-1-git-send-email-larsxschneider@gmail.com>
From: Lars Schneider <larsxschneider@gmail.com>
Junio usually pushes many commits at once to the public "pu"/"next"/
"master" branches. If a test fails then it is not obvious what commit
caused the failure. Therefore we run Git bisect with the merge base
between the failing rev and its more stable branch ("next" for "pu",
"master" for "next", and "maint" for "master") as good ref to find the
offending commit. This is only enabled on "github.com/git/git" because
there we can assume that all relevant branches are up to date.
Signed-off-by: Lars Schneider <larsxschneider@gmail.com>
---
.travis.yml | 2 +-
ci/test-report.sh | 65 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 66 insertions(+), 1 deletion(-)
diff --git a/.travis.yml b/.travis.yml
index 81d2027..922807b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -101,7 +101,7 @@ script: make --quiet test
after_failure:
- >
: '<-- Click here to see detailed test output! ';
- ./ci/test-report.sh
+ ./ci/test-report.sh $TRAVIS_REPO_SLUG $TRAVIS_BRANCH;
notifications:
email: false
diff --git a/ci/test-report.sh b/ci/test-report.sh
index d08a999..8f7adad 100755
--- a/ci/test-report.sh
+++ b/ci/test-report.sh
@@ -1,5 +1,12 @@
#!/bin/sh
#
+# Print test results and run Git bisect on failed tests.
+#
+REPO_ORG_NAME=$1
+CURRENT_BRANCH_NAME=$2
+
+
+#
# Print test results
#
for TEST_EXIT in t/test-results/*.exit
@@ -17,3 +24,61 @@ do
fi
done
+
+#
+# Run Git bisect
+#
+run_bisect () {
+ TEST_SCRIPT=$1
+ BAD_REV=$2
+ GOOD_RV=$3
+ TMPDIR=$(mktemp -d -t "ci-report-bisect-XXXXXX" 2>/dev/null)
+ cat > "$TMPDIR/bisect-run.sh" <<EOF
+
+EOF
+ chmod +x "$TMPDIR/bisect-run.sh"
+ git bisect start $BAD_REV $GOOD_RV
+ git bisect run "$TMPDIR/bisect-run.sh"
+ if test -e ./t/$TEST_SCRIPT.sh && make --jobs=2 >/dev/null 2>&1
+ then
+ cd t && ./$TEST_SCRIPT.sh >/dev/null 2>&1
+ else
+ # If the test file does not exist or the build fails then tell
+ # Git bisect to skip the commit.
+ exit 125
+ fi
+ git bisect reset >/dev/null 2>&1
+}
+
+case "$CURRENT_BRANCH_NAME" in
+ master) STABLE_BRANCH="maint";;
+ next) STABLE_BRANCH="master";;
+ pu) STABLE_BRANCH="next";;
+esac
+
+if test "$REPO_ORG_NAME" = "git/git" && test -n $STABLE_BRANCH
+then
+ BAD_REV=$(git rev-parse HEAD)
+
+ # Travis CI clones are shallow. It is possible that the last good revision
+ # was not fetched, yet. Therefore we need to fetch all commits on the
+ # stable branch.
+ git config remote.origin.fetch "+refs/heads/$STABLE_BRANCH:refs/remotes/origin/$STABLE_BRANCH"
+ git fetch --unshallow --quiet
+ LAST_GOOD_REV=$(git merge-base $BAD_REV "remotes/origin/$STABLE_BRANCH")
+
+ for TEST_EXIT in t/test-results/*.exit
+ do
+ if test "$(cat "$TEST_EXIT")" != "0"
+ then
+ TEST="${TEST_EXIT%.exit}"
+ TEST_SCRIPT=${TEST#t/test-results/}
+ echo "------------------------------------------------------------------------"
+ echo " $(tput setaf 1)${TEST} Bisect$(tput sgr0)"
+ echo "------------------------------------------------------------------------"
+ run_bisect $TEST_SCRIPT $BAD_REV $LAST_GOOD_REV
+ echo ""
+ echo ""
+ fi
+ done
+fi
--
2.5.1
next prev parent reply other threads:[~2016-05-22 11:01 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-05-22 11:00 [PATCH v1 0/3] travis-ci: run Git bisect on failed tests larsxschneider
2016-05-22 11:00 ` [PATCH v1 1/3] travis-ci: move "after_failure" code to dedicated file in /ci larsxschneider
2016-05-22 11:00 ` [PATCH v1 2/3] travis-ci: disable verbose test output larsxschneider
2016-05-26 4:54 ` Jeff King
2016-05-22 11:00 ` larsxschneider [this message]
2016-05-22 15:35 ` [PATCH v1 3/3] travis-ci: run Git bisect on failed tests Christian Couder
2016-05-22 16:35 ` Lars Schneider
2016-05-22 17:21 ` Pranit Bauva
2016-05-23 8:36 ` Lars Schneider
2016-05-23 1:22 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1463914856-64745-4-git-send-email-larsxschneider@gmail.com \
--to=larsxschneider@gmail.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).