mirror of
https://github.com/python/cpython.git
synced 2025-12-01 23:32:16 +00:00
svn+ssh://pythondev@svn.python.org/python/branches/p3yk
................
r55636 | neal.norwitz | 2007-05-29 00:06:39 -0700 (Tue, 29 May 2007) | 149 lines
Merged revisions 55506-55635 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r55507 | georg.brandl | 2007-05-22 07:28:17 -0700 (Tue, 22 May 2007) | 2 lines
Remove the "panel" module doc file which has been ignored since 1994.
........
r55522 | mark.hammond | 2007-05-22 19:04:28 -0700 (Tue, 22 May 2007) | 4 lines
Remove definition of PY_UNICODE_TYPE from pyconfig.h, allowing the
definition in unicodeobject.h to be used, giving us the desired
wchar_t in place of 'unsigned short'. As discussed on python-dev.
........
r55525 | neal.norwitz | 2007-05-22 23:35:32 -0700 (Tue, 22 May 2007) | 6 lines
Add -3 option to the interpreter to warn about features that are
deprecated and will be changed/removed in Python 3.0.
This patch is mostly from Anthony. I tweaked some format and added
a little doc.
........
r55527 | neal.norwitz | 2007-05-22 23:57:35 -0700 (Tue, 22 May 2007) | 1 line
Whitespace cleanup
........
r55528 | neal.norwitz | 2007-05-22 23:58:36 -0700 (Tue, 22 May 2007) | 1 line
Add a bunch more deprecation warnings for builtins that are going away in 3.0
........
r55549 | georg.brandl | 2007-05-24 09:49:29 -0700 (Thu, 24 May 2007) | 2 lines
shlex.split() now has an optional "posix" parameter.
........
r55550 | georg.brandl | 2007-05-24 10:33:33 -0700 (Thu, 24 May 2007) | 2 lines
Fix parameter passing.
........
r55555 | facundo.batista | 2007-05-24 10:50:54 -0700 (Thu, 24 May 2007) | 6 lines
Added an optional timeout parameter to urllib.ftpwrapper, with tests
(for this and a basic one, because there weren't any). Changed also
NEWS, but didn't find documentation for this function, assumed it
wasn't public...
........
r55563 | facundo.batista | 2007-05-24 13:01:59 -0700 (Thu, 24 May 2007) | 4 lines
Removed the .recv() in the test, is not necessary, and was
causing problems that didn't have anything to do with was
actually being tested...
........
r55564 | facundo.batista | 2007-05-24 13:51:19 -0700 (Thu, 24 May 2007) | 5 lines
Let's see if reading exactly what is written allow this live
test to pass (now I know why there were so few tests in ftp,
http, etc, :( ).
........
r55567 | facundo.batista | 2007-05-24 20:10:28 -0700 (Thu, 24 May 2007) | 4 lines
Trying to make the tests work in Windows and Solaris, everywhere
else just works
........
r55568 | facundo.batista | 2007-05-24 20:47:19 -0700 (Thu, 24 May 2007) | 4 lines
Fixing stupid error, and introducing a sleep, to see if the
other thread is awakened and finish sending data.
........
r55569 | facundo.batista | 2007-05-24 21:20:22 -0700 (Thu, 24 May 2007) | 4 lines
Commenting out the tests until find out who can test them in
one of the problematic enviroments.
........
r55570 | neal.norwitz | 2007-05-24 22:13:40 -0700 (Thu, 24 May 2007) | 2 lines
Get test passing again by commenting out the reference to the test class.
........
r55575 | vinay.sajip | 2007-05-25 00:05:59 -0700 (Fri, 25 May 2007) | 1 line
Updated docstring for SysLogHandler (#1720726).
........
r55576 | vinay.sajip | 2007-05-25 00:06:55 -0700 (Fri, 25 May 2007) | 1 line
Updated documentation for SysLogHandler (#1720726).
........
r55592 | brett.cannon | 2007-05-25 13:17:15 -0700 (Fri, 25 May 2007) | 3 lines
Remove direct call's to file's constructor and replace them with calls to
open() as ths is considered best practice.
........
r55601 | kristjan.jonsson | 2007-05-26 12:19:50 -0700 (Sat, 26 May 2007) | 1 line
Remove the rgbimgmodule from PCBuild8
........
r55602 | kristjan.jonsson | 2007-05-26 12:31:39 -0700 (Sat, 26 May 2007) | 1 line
Include <windows.h> after python.h, so that WINNT is properly set before windows.h is included. Fixes warnings in PC builds.
........
r55603 | walter.doerwald | 2007-05-26 14:04:13 -0700 (Sat, 26 May 2007) | 2 lines
Fix typo.
........
r55604 | peter.astrand | 2007-05-26 15:18:20 -0700 (Sat, 26 May 2007) | 1 line
Applied patch 1669481, slightly modified: Support close_fds on Win32
........
r55606 | neal.norwitz | 2007-05-26 21:08:54 -0700 (Sat, 26 May 2007) | 2 lines
Add the new function object attribute names from py3k.
........
r55617 | lars.gustaebel | 2007-05-27 12:49:30 -0700 (Sun, 27 May 2007) | 20 lines
Added errors argument to TarFile class that allows the user to
specify an error handling scheme for character conversion. Additional
scheme "utf-8" in read mode. Unicode input filenames are now
supported by design. The values of the pax_headers dictionary are now
limited to unicode objects.
Fixed: The prefix field is no longer used in PAX_FORMAT (in
conformance with POSIX).
Fixed: In read mode use a possible pax header size field.
Fixed: Strip trailing slashes from pax header name values.
Fixed: Give values in user-specified pax_headers precedence when
writing.
Added unicode tests. Added pax/regtype4 member to testtar.tar all
possible number fields in a pax header.
Added two chapters to the documentation about the different formats
tarfile.py supports and how unicode issues are handled.
........
r55618 | raymond.hettinger | 2007-05-27 22:23:22 -0700 (Sun, 27 May 2007) | 1 line
Explain when groupby() issues a new group.
........
r55634 | martin.v.loewis | 2007-05-28 21:01:29 -0700 (Mon, 28 May 2007) | 2 lines
Test pre-commit hook for a link to a .py file.
........
r55635 | martin.v.loewis | 2007-05-28 21:02:03 -0700 (Mon, 28 May 2007) | 2 lines
Revert 55634.
........
................
r55639 | neal.norwitz | 2007-05-29 00:58:11 -0700 (Tue, 29 May 2007) | 1 line
Remove sys.exc_{type,exc_value,exc_traceback}
................
r55641 | neal.norwitz | 2007-05-29 01:03:50 -0700 (Tue, 29 May 2007) | 1 line
Missed one sys.exc_type. I wonder why exc_{value,traceback} were already gone
................
r55642 | neal.norwitz | 2007-05-29 01:08:33 -0700 (Tue, 29 May 2007) | 1 line
Missed more doc for sys.exc_* attrs.
................
r55643 | neal.norwitz | 2007-05-29 01:18:19 -0700 (Tue, 29 May 2007) | 1 line
Remove sys.exc_clear()
................
r55665 | guido.van.rossum | 2007-05-29 19:45:43 -0700 (Tue, 29 May 2007) | 4 lines
Make None, True, False keywords.
We can now also delete all the other places that explicitly forbid
assignment to None, but I'm not going to bother right now.
................
r55666 | guido.van.rossum | 2007-05-29 20:01:51 -0700 (Tue, 29 May 2007) | 3 lines
Found another place that needs check for forbidden names.
Fixed test_syntax.py accordingly (it helped me find that one).
................
r55668 | guido.van.rossum | 2007-05-29 20:41:48 -0700 (Tue, 29 May 2007) | 2 lines
Mark None, True, False as keywords.
................
r55673 | neal.norwitz | 2007-05-29 23:28:25 -0700 (Tue, 29 May 2007) | 3 lines
Get the dis module working on modules again after changing dicts
to not return lists and also new-style classes. Add a test.
................
r55674 | neal.norwitz | 2007-05-29 23:35:45 -0700 (Tue, 29 May 2007) | 1 line
Umm, it helps to add the module that the test uses
................
r55675 | neal.norwitz | 2007-05-29 23:53:05 -0700 (Tue, 29 May 2007) | 4 lines
Try to fix up all the other places that were assigning to True/False.
There's at least one more problem in test.test_xmlrpc. I have other
changes in that file and that should be fixed soon (I hope).
................
r55679 | neal.norwitz | 2007-05-30 00:31:55 -0700 (Wed, 30 May 2007) | 1 line
Fix up another place that was assigning to True/False.
................
r55688 | brett.cannon | 2007-05-30 14:19:47 -0700 (Wed, 30 May 2007) | 2 lines
Ditch MimeWriter.
................
r55692 | brett.cannon | 2007-05-30 14:52:00 -0700 (Wed, 30 May 2007) | 2 lines
Remove the mimify module.
................
r55707 | guido.van.rossum | 2007-05-31 05:08:45 -0700 (Thu, 31 May 2007) | 2 lines
Backport the addition of show_code() to dis.py -- it's too handy.
................
r55708 | guido.van.rossum | 2007-05-31 06:22:57 -0700 (Thu, 31 May 2007) | 7 lines
Fix a fairly long-standing bug in the check for assignment to None (and other
keywords, these days). In 2.5, you could write foo(None=1) without getting
a SyntaxError (although foo()'s definition would have to use **kwds to avoid
getting a runtime error complaining about an unknown keyword of course).
This ought to be backported to 2.5.2 or at least 2.6.
................
r55724 | brett.cannon | 2007-05-31 19:32:41 -0700 (Thu, 31 May 2007) | 2 lines
Remove the cfmfile.
................
r55727 | neal.norwitz | 2007-05-31 22:19:44 -0700 (Thu, 31 May 2007) | 1 line
Remove reload() builtin.
................
r55729 | neal.norwitz | 2007-05-31 22:51:30 -0700 (Thu, 31 May 2007) | 59 lines
Merged revisions 55636-55728 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r55637 | georg.brandl | 2007-05-29 00:16:47 -0700 (Tue, 29 May 2007) | 2 lines
Fix rst markup.
........
r55638 | neal.norwitz | 2007-05-29 00:51:39 -0700 (Tue, 29 May 2007) | 1 line
Fix typo in doc
........
r55671 | neal.norwitz | 2007-05-29 21:53:41 -0700 (Tue, 29 May 2007) | 1 line
Fix indentation (whitespace only).
........
r55676 | thomas.heller | 2007-05-29 23:58:30 -0700 (Tue, 29 May 2007) | 1 line
Fix compiler warnings.
........
r55677 | thomas.heller | 2007-05-30 00:01:25 -0700 (Wed, 30 May 2007) | 2 lines
Correct the name of a field in the WIN32_FIND_DATAA and WIN32_FIND_DATAW structures.
Closes bug #1726026.
........
r55686 | brett.cannon | 2007-05-30 13:46:26 -0700 (Wed, 30 May 2007) | 2 lines
Have MimeWriter raise a DeprecationWarning as per PEP 4 and its documentation.
........
r55690 | brett.cannon | 2007-05-30 14:48:58 -0700 (Wed, 30 May 2007) | 3 lines
Have mimify raise a DeprecationWarning. The docs and PEP 4 have listed the
module as deprecated for a while.
........
r55696 | brett.cannon | 2007-05-30 15:24:28 -0700 (Wed, 30 May 2007) | 2 lines
Have md5 raise a DeprecationWarning as per PEP 4.
........
r55705 | neal.norwitz | 2007-05-30 21:14:22 -0700 (Wed, 30 May 2007) | 1 line
Add some spaces in the example code.
........
r55716 | brett.cannon | 2007-05-31 12:20:00 -0700 (Thu, 31 May 2007) | 2 lines
Have the sha module raise a DeprecationWarning as specified in PEP 4.
........
r55719 | brett.cannon | 2007-05-31 12:40:42 -0700 (Thu, 31 May 2007) | 2 lines
Cause buildtools to raise a DeprecationWarning.
........
r55721 | brett.cannon | 2007-05-31 13:01:11 -0700 (Thu, 31 May 2007) | 2 lines
Have cfmfile raise a DeprecationWarning as per PEP 4.
........
r55726 | neal.norwitz | 2007-05-31 21:56:47 -0700 (Thu, 31 May 2007) | 1 line
Mail if there is an installation failure.
........
................
r55730 | neal.norwitz | 2007-05-31 23:22:07 -0700 (Thu, 31 May 2007) | 2 lines
Remove the code that was missed in rev 55303.
................
r55738 | neal.norwitz | 2007-06-01 19:10:43 -0700 (Fri, 01 Jun 2007) | 1 line
Fix doc breakage
................
r55741 | neal.norwitz | 2007-06-02 00:41:58 -0700 (Sat, 02 Jun 2007) | 1 line
Remove timing module (plus some remnants of other modules).
................
r55742 | neal.norwitz | 2007-06-02 00:51:44 -0700 (Sat, 02 Jun 2007) | 1 line
Remove posixfile module (plus some remnants of other modules).
................
r55744 | neal.norwitz | 2007-06-02 10:18:56 -0700 (Sat, 02 Jun 2007) | 1 line
Fix doc breakage.
................
r55745 | neal.norwitz | 2007-06-02 11:32:16 -0700 (Sat, 02 Jun 2007) | 1 line
Make a whatsnew 3.0 template.
................
r55754 | neal.norwitz | 2007-06-03 23:24:18 -0700 (Sun, 03 Jun 2007) | 1 line
SF #1730441, os._execvpe raises UnboundLocal due to new try/except semantics
................
r55755 | neal.norwitz | 2007-06-03 23:26:00 -0700 (Sun, 03 Jun 2007) | 1 line
Get rid of extra whitespace
................
r55794 | guido.van.rossum | 2007-06-06 15:29:22 -0700 (Wed, 06 Jun 2007) | 3 lines
Make this compile in GCC 2.96, which does not allow interspersing
declarations and code.
................
248 lines
8.4 KiB
Bash
Executable file
248 lines
8.4 KiB
Bash
Executable file
#!/bin/sh
|
|
|
|
## Script to build and test the latest python from svn. It basically
|
|
## does this:
|
|
## svn up ; ./configure ; make ; make test ; make install ; cd Doc ; make
|
|
##
|
|
## Logs are kept and rsync'ed to the host. If there are test failure(s),
|
|
## information about the failure(s) is mailed.
|
|
##
|
|
## This script is run on the PSF's machine as user neal via crontab.
|
|
##
|
|
## Yes, this script would probably be easier in python, but then
|
|
## there's a bootstrap problem. What if Python doesn't build?
|
|
##
|
|
## This script should be fairly clean Bourne shell, ie not too many
|
|
## bash-isms. We should try to keep it portable to other Unixes.
|
|
## Even though it will probably only run on Linux. I'm sure there are
|
|
## several GNU-isms currently (date +%s and readlink).
|
|
##
|
|
## Perhaps this script should be broken up into 2 (or more) components.
|
|
## Building doc is orthogonal to the rest of the python build/test.
|
|
##
|
|
|
|
## FIXME: we should detect test hangs (eg, if they take more than 45 minutes)
|
|
|
|
## FIXME: we should run valgrind
|
|
## FIXME: we should run code coverage
|
|
|
|
## Utilities invoked in this script include:
|
|
## basename, date, dirname, expr, grep, readlink, uname
|
|
## cksum, make, mutt, rsync, svn
|
|
|
|
## remember where did we started from
|
|
DIR=`dirname $0`
|
|
if [ "$DIR" = "" ]; then
|
|
DIR="."
|
|
fi
|
|
|
|
## make directory absolute
|
|
DIR=`readlink -f $DIR`
|
|
FULLPATHNAME="$DIR/`basename $0`"
|
|
## we want Misc/..
|
|
DIR=`dirname $DIR`
|
|
|
|
## Configurable options
|
|
|
|
FAILURE_SUBJECT="Python Regression Test Failures"
|
|
#FAILURE_MAILTO="YOUR_ACCOUNT@gmail.com"
|
|
FAILURE_MAILTO="python-3000-checkins@python.org"
|
|
#FAILURE_CC="optional--uncomment and set to desired address"
|
|
|
|
REMOTE_SYSTEM="neal@dinsdale.python.org"
|
|
REMOTE_DIR="/data/ftp.python.org/pub/docs.python.org/dev/3.0"
|
|
RESULT_FILE="$DIR/build/index.html"
|
|
INSTALL_DIR="/tmp/python-test-3.0/local"
|
|
RSYNC_OPTS="-aC -e ssh"
|
|
|
|
# Always run the installed version of Python.
|
|
PYTHON=$INSTALL_DIR/bin/python
|
|
|
|
# Python options and regression test program that should always be run.
|
|
REGRTEST_ARGS="-E -tt $INSTALL_DIR/lib/python3.0/test/regrtest.py"
|
|
|
|
REFLOG="build/reflog.txt.out"
|
|
# These tests are not stable and falsely report leaks sometimes.
|
|
# The entire leak report will be mailed if any test not in this list leaks.
|
|
# Note: test_XXX (none currently) really leak, but are disabled
|
|
# so we don't send spam. Any test which really leaks should only
|
|
# be listed here if there are also test cases under Lib/test/leakers.
|
|
LEAKY_TESTS="test_(cmd_line|socket)"
|
|
|
|
# These tests always fail, so skip them so we don't get false positives.
|
|
_ALWAYS_SKIP="test_compiler test_transformer"
|
|
ALWAYS_SKIP="-x $_ALWAYS_SKIP"
|
|
|
|
# Skip these tests altogether when looking for leaks. These tests
|
|
# do not need to be stored above in LEAKY_TESTS too.
|
|
# test_compiler almost never finishes with the same number of refs
|
|
# since it depends on other modules, skip it.
|
|
# test_logging causes hangs, skip it.
|
|
LEAKY_SKIPS="-x test_compiler test_logging $_ALWAYS_SKIP"
|
|
|
|
# Change this flag to "yes" for old releases to only update/build the docs.
|
|
BUILD_DISABLED="no"
|
|
|
|
## utility functions
|
|
current_time() {
|
|
date +%s
|
|
}
|
|
|
|
update_status() {
|
|
now=`current_time`
|
|
time=`expr $now - $3`
|
|
echo "<li><a href=\"$2\">$1</a> <font size=\"-1\">($time seconds)</font></li>" >> $RESULT_FILE
|
|
}
|
|
|
|
mail_on_failure() {
|
|
if [ "$NUM_FAILURES" != "0" ]; then
|
|
dest=$FAILURE_MAILTO
|
|
# FAILURE_CC is optional.
|
|
if [ "$FAILURE_CC" != "" ]; then
|
|
dest="$dest -c $FAILURE_CC"
|
|
fi
|
|
mutt -s "$FAILURE_SUBJECT $1 ($NUM_FAILURES)" $dest < $2
|
|
fi
|
|
}
|
|
|
|
## setup
|
|
cd $DIR
|
|
mkdir -p build
|
|
rm -f $RESULT_FILE build/*.out
|
|
rm -rf $INSTALL_DIR
|
|
|
|
## create results file
|
|
TITLE="Automated Python Build Results"
|
|
echo "<html>" >> $RESULT_FILE
|
|
echo " <head>" >> $RESULT_FILE
|
|
echo " <title>$TITLE</title>" >> $RESULT_FILE
|
|
echo " <meta http-equiv=\"refresh\" content=\"43200\">" >> $RESULT_FILE
|
|
echo " </head>" >> $RESULT_FILE
|
|
echo "<body>" >> $RESULT_FILE
|
|
echo "<h2>Automated Python Build Results</h2>" >> $RESULT_FILE
|
|
echo "<table>" >> $RESULT_FILE
|
|
echo " <tr>" >> $RESULT_FILE
|
|
echo " <td>Built on:</td><td>`date`</td>" >> $RESULT_FILE
|
|
echo " </tr><tr>" >> $RESULT_FILE
|
|
echo " <td>Hostname:</td><td>`uname -n`</td>" >> $RESULT_FILE
|
|
echo " </tr><tr>" >> $RESULT_FILE
|
|
echo " <td>Platform:</td><td>`uname -srmpo`</td>" >> $RESULT_FILE
|
|
echo " </tr>" >> $RESULT_FILE
|
|
echo "</table>" >> $RESULT_FILE
|
|
echo "<ul>" >> $RESULT_FILE
|
|
|
|
## update, build, and test
|
|
ORIG_CHECKSUM=`cksum $FULLPATHNAME`
|
|
F=svn-update.out
|
|
start=`current_time`
|
|
svn update >& build/$F
|
|
err=$?
|
|
update_status "Updating" "$F" $start
|
|
if [ $err = 0 -a "$BUILD_DISABLED" != "yes" ]; then
|
|
## FIXME: we should check if this file has changed.
|
|
## If it has changed, we should re-run the script to pick up changes.
|
|
if [ "$ORIG_CHECKSUM" != "$ORIG_CHECKSUM" ]; then
|
|
exec $FULLPATHNAME $@
|
|
fi
|
|
|
|
F=svn-stat.out
|
|
start=`current_time`
|
|
svn stat >& build/$F
|
|
## ignore some of the diffs
|
|
NUM_DIFFS=`egrep -vc '^. (@test|db_home|Lib/test/(regrtest\.py|db_home))$' build/$F`
|
|
update_status "svn stat ($NUM_DIFFS possibly important diffs)" "$F" $start
|
|
|
|
F=configure.out
|
|
start=`current_time`
|
|
./configure --prefix=$INSTALL_DIR --with-pydebug >& build/$F
|
|
err=$?
|
|
update_status "Configuring" "$F" $start
|
|
if [ $err = 0 ]; then
|
|
F=make.out
|
|
start=`current_time`
|
|
make >& build/$F
|
|
err=$?
|
|
warnings=`grep warning build/$F | egrep -vc "te?mpnam(_r|)' is dangerous,"`
|
|
update_status "Building ($warnings warnings)" "$F" $start
|
|
if [ $err = 0 ]; then
|
|
## make install
|
|
F=make-install.out
|
|
start=`current_time`
|
|
make install >& build/$F
|
|
update_status "Installing" "$F" $start
|
|
mail_on_failure "install" build/$F
|
|
|
|
if [ ! -x $PYTHON ]; then
|
|
ln -s ${PYTHON}3.* $PYTHON
|
|
fi
|
|
|
|
## make and run basic tests
|
|
F=make-test.out
|
|
start=`current_time`
|
|
$PYTHON $REGRTEST_ARGS $ALWAYS_SKIP >& build/$F
|
|
NUM_FAILURES=`grep -ic " failed:" build/$F`
|
|
update_status "Testing basics ($NUM_FAILURES failures)" "$F" $start
|
|
mail_on_failure "basics" build/$F
|
|
|
|
F=make-test-opt.out
|
|
start=`current_time`
|
|
$PYTHON -O $REGRTEST_ARGS $ALWAYS_SKIP >& build/$F
|
|
NUM_FAILURES=`grep -ic " failed:" build/$F`
|
|
update_status "Testing opt ($NUM_FAILURES failures)" "$F" $start
|
|
mail_on_failure "opt" build/$F
|
|
|
|
## run the tests looking for leaks
|
|
F=make-test-refleak.out
|
|
start=`current_time`
|
|
## ensure that the reflog exists so the grep doesn't fail
|
|
touch $REFLOG
|
|
$PYTHON $REGRTEST_ARGS -R 4:3:$REFLOG -u network $LEAKY_SKIPS >& build/$F
|
|
NUM_FAILURES=`egrep -vc "($LEAKY_TESTS|sum=0)" $REFLOG`
|
|
update_status "Testing refleaks ($NUM_FAILURES failures)" "$F" $start
|
|
mail_on_failure "refleak" $REFLOG
|
|
|
|
## now try to run all the tests
|
|
F=make-testall.out
|
|
start=`current_time`
|
|
## skip curses when running from cron since there's no terminal
|
|
## skip sound since it's not setup on the PSF box (/dev/dsp)
|
|
$PYTHON $REGRTEST_ARGS -uall -x test_curses test_linuxaudiodev test_ossaudiodev $_ALWAYS_SKIP >& build/$F
|
|
NUM_FAILURES=`grep -ic " failed:" build/$F`
|
|
update_status "Testing all except curses and sound ($NUM_FAILURES failures)" "$F" $start
|
|
mail_on_failure "all" build/$F
|
|
fi
|
|
fi
|
|
fi
|
|
|
|
|
|
## make doc
|
|
cd $DIR/Doc
|
|
F="make-doc.out"
|
|
start=`current_time`
|
|
# Doc/commontex/boilerplate.tex is expected to always have an outstanding
|
|
# modification for the date. When a release is cut, a conflict occurs.
|
|
# This allows us to detect this problem and not try to build the docs
|
|
# which will definitely fail with a conflict.
|
|
CONFLICTED_FILE=commontex/boilerplate.tex
|
|
conflict_count=`grep -c "<<<" $CONFLICTED_FILE`
|
|
if [ $conflict_count != 0 ]; then
|
|
echo "Conflict detected in $CONFLICTED_FILE. Doc build skipped." > ../build/$F
|
|
err=1
|
|
else
|
|
make >& ../build/$F
|
|
err=$?
|
|
fi
|
|
update_status "Making doc" "$F" $start
|
|
if [ $err != 0 ]; then
|
|
NUM_FAILURES=1
|
|
mail_on_failure "doc" ../build/$F
|
|
fi
|
|
|
|
echo "</ul>" >> $RESULT_FILE
|
|
echo "</body>" >> $RESULT_FILE
|
|
echo "</html>" >> $RESULT_FILE
|
|
|
|
## copy results
|
|
rsync $RSYNC_OPTS html/* $REMOTE_SYSTEM:$REMOTE_DIR
|
|
cd ../build
|
|
rsync $RSYNC_OPTS index.html *.out $REMOTE_SYSTEM:$REMOTE_DIR/results/
|