mirror of
https://github.com/dashpay/dash.git
synced 2024-12-26 12:32:48 +01:00
857814d1eb
3491bf358a81d41a386cd14581d15396354a6e6c test: Mention commit id in scripted diff error (Wladimir J. van der Laan)
Pull request description:
Add commit id to make spotting the issue easier.
ACKs for top commit:
robot-dreams:
ACK 3491bf358a81d41a386cd14581d15396354a6e6c
sipa:
utACK 3491bf358a81d41a386cd14581d15396354a6e6c
hebasto:
~ACK~ Concept ACK 3491bf358a81d41a386cd14581d15396354a6e6c, should help in situations like https://travis-ci.org/github/bitcoin/bitcoin/jobs/732481553
Tree-SHA512: 1ae66fa760f9e5d52e029bae71f6b5863f1efd7b95de3723ea09290944c9d7687f5ec6927aa115a3aebd6f2b993baa0c2433975c6ad5cd2858089013362eb599
48 lines
1.7 KiB
Bash
Executable File
48 lines
1.7 KiB
Bash
Executable File
#!/bin/sh
|
|
# Copyright (c) 2017 The Bitcoin Core developers
|
|
# Distributed under the MIT software license, see the accompanying
|
|
# file COPYING or http://www.opensource.org/licenses/mit-license.php.
|
|
|
|
# This simple script checks for commits beginning with: scripted-diff:
|
|
# If found, looks for a script between the lines -BEGIN VERIFY SCRIPT- and
|
|
# -END VERIFY SCRIPT-. If no ending is found, it reads until the end of the
|
|
# commit message.
|
|
|
|
# The resulting script should exactly transform the previous commit into the current
|
|
# one. Any remaining diff signals an error.
|
|
|
|
export LC_ALL=C
|
|
if test -z "$1"; then
|
|
echo "Usage: $0 <commit>..."
|
|
exit 1
|
|
fi
|
|
|
|
RET=0
|
|
PREV_BRANCH=`git name-rev --name-only HEAD`
|
|
PREV_HEAD=`git rev-parse HEAD`
|
|
for commit in `git rev-list --reverse $1`; do
|
|
if git rev-list -n 1 --pretty="%s" $commit | grep -q "^scripted-diff:"; then
|
|
git checkout --quiet $commit^ || exit
|
|
SCRIPT="`git rev-list --format=%b -n1 $commit | sed '/^-BEGIN VERIFY SCRIPT-$/,/^-END VERIFY SCRIPT-$/{//!b};d'`"
|
|
if test -z "$SCRIPT"; then
|
|
echo "Error: missing script for: $commit"
|
|
echo "Failed"
|
|
RET=1
|
|
else
|
|
echo "Running script for: $commit"
|
|
echo "$SCRIPT"
|
|
(eval "$SCRIPT")
|
|
git --no-pager diff --exit-code $commit && echo "OK" || (echo "Failed"; false) || RET=1
|
|
fi
|
|
git reset --quiet --hard HEAD
|
|
else
|
|
if git rev-list "--format=%b" -n1 $commit | grep -q '^-\(BEGIN\|END\)[ a-zA-Z]*-$'; then
|
|
echo "Error: script block marker but no scripted-diff in title of commit $commit"
|
|
echo "Failed"
|
|
RET=1
|
|
fi
|
|
fi
|
|
done
|
|
git checkout --quiet $PREV_BRANCH 2>/dev/null || git checkout --quiet $PREV_HEAD
|
|
exit $RET
|