summaryrefslogtreecommitdiff
path: root/tools/pre-commit
diff options
context:
space:
mode:
authorJohn Wiegley <johnw@newartisans.com>2010-06-03 01:25:03 -0400
committerJohn Wiegley <johnw@newartisans.com>2010-06-03 01:25:03 -0400
commit4a0236e964f5b39f38c3a8cd560bcfe6e4878912 (patch)
tree50113f700cb94f03a3eb9b0d6a6baef0049a4c68 /tools/pre-commit
parent24b6afaf144a7ee43bc48bfd4cca8de863cb185c (diff)
downloadfork-ledger-4a0236e964f5b39f38c3a8cd560bcfe6e4878912.tar.gz
fork-ledger-4a0236e964f5b39f38c3a8cd560bcfe6e4878912.tar.bz2
fork-ledger-4a0236e964f5b39f38c3a8cd560bcfe6e4878912.zip
Updated tools/pre-commit
Diffstat (limited to 'tools/pre-commit')
-rwxr-xr-xtools/pre-commit14
1 files changed, 9 insertions, 5 deletions
diff --git a/tools/pre-commit b/tools/pre-commit
index c049b8f0..50a32dbd 100755
--- a/tools/pre-commit
+++ b/tools/pre-commit
@@ -5,7 +5,7 @@ set -e
# Exit if it's not a branch we're interested in being thorough about
if echo $(git rev-parse --symbolic-full-name HEAD) | \
- egrep -q '^refs/heads/(next|t/)'; then
+ egrep -q '^refs/heads/(t/)'; then
exit 0
fi
@@ -41,12 +41,12 @@ cd $TMPDIR
if [ ! -f Makefile -o \
Makefile.in -nt Makefile -o \
configure -nt Makefile -o \
- Makefile.am -nt Makefile.in -o \
- configure.ac -nt configure -o \
+ tools/Makefile.am -nt Makefile.in -o \
+ tools/configure.ac -nt configure -o \
\( -f acprep -a acprep -nt Makefile \) ]
then
if [ -f acprep ]; then
- ./acprep default --local
+ echo Will run acprep in a moment
elif [ -f autogen.sh ]; then
sh autogen.sh && ./configure
else
@@ -56,6 +56,10 @@ fi
# Finally, (re)build this proposed source tree and see if it passes
# muster.
-nice -n 20 make check
+if [ -f acprep ]; then
+ nice -n 20 ./acprep default --warn make check
+else
+ nice -n 20 make check
+fi
exit 0