nightly build: Merge from trunk

git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/2.2.x@4660 d57e44dd-8a1f-0410-8b47-8ef2f437770f
This commit is contained in:
Bart Van Assche
2012-12-20 17:58:34 +00:00
parent 4fd2d32b80
commit ed5db967d8
2 changed files with 7 additions and 7 deletions

View File

@@ -12,7 +12,7 @@
# Returns the revision number of the source files with date $1.
get_revision() {
if svn info . >&/dev/null; then
if svn info . >/dev/null 2>&1; then
svn info -r "{$1}" "${scst_repo}" | sed -n 's/^Revision: //p'
else
git log --before="$1" | head -n 1 | cut -f2 -d ' '
@@ -53,7 +53,7 @@ usage () {
# Startup
#----------------------------------------------------------------------------
if svn info . >&/dev/null; then
if svn info . >/dev/null 2>&1; then
scst_repo="https://scst.svn.sourceforge.net/svnroot/scst/trunk"
else
scst_repo="$(dirname "$(dirname "$(cd "$(dirname "$0")" && echo "$PWD")")")"
@@ -150,7 +150,7 @@ for logfile in old new ; do
# Check out and run the tests.
runcmd ${logfile} \
"Checking out SCST source tree" \
"if svn info . >&/dev/null; then \
"if svn info . >/dev/null 2>&1; then \
svn co -q -r {${date}} ${scst_repo} ${ABT_TMPDIR}/scst; \
else \
( rmdir ${ABT_TMPDIR}/scst && \

View File

@@ -3,13 +3,13 @@
ABT_DETAILS="x86_64"
ABT_JOBS=5
ABT_KERNELS=" \
3.6.3 \
3.6.11 \
3.5.7 \
3.4.15 \
3.4.24 \
3.3.8-nc \
3.2.31-nc \
3.2.35-nc \
3.1.10-nc \
3.0.47-nc \
3.0.57-nc \
2.6.39.4-nc \
2.6.38.8-nc \
2.6.37.6-nc \