~ubuntu-branches/ubuntu/trusty/rsync/trusty

« back to all changes in this revision

Viewing changes to runtests.sh

  • Committer: Package Import Robot
  • Author(s): Paul Slootman
  • Date: 2013-10-27 12:01:10 UTC
  • mfrom: (1.1.13) (2.1.11 sid)
  • Revision ID: package-import@ubuntu.com-20131027120110-mpr03n5scqmf40mi
Tags: 3.1.0-2
fix build failure if zlib1g-dev package is not installed;
solved by building without the included zlib source and adding a
build-depends on zlib1g-dev >= 1:1.2.8
closes:32379

Show diffs side-by-side

added added

removed removed

Lines of Context:
232
232
[ -d "$scratchbase" ] || mkdir "$scratchbase"
233
233
 
234
234
suitedir="$srcdir/testsuite"
 
235
TESTRUN_TIMEOUT=300
235
236
 
236
 
export scratchdir suitedir
 
237
export scratchdir suitedir TESTRUN_TIMEOUT
237
238
 
238
239
prep_scratch() {
239
240
    [ -d "$scratchdir" ] && chmod -R u+rwX "$scratchdir" && rm -rf "$scratchdir"
264
265
 
265
266
    prep_scratch
266
267
 
 
268
    case "$testscript" in
 
269
    *hardlinks*) TESTRUN_TIMEOUT=600 ;;
 
270
    *) TESTRUN_TIMEOUT=300 ;;
 
271
    esac
 
272
 
267
273
    set +e
268
 
    sh $RUNSHFLAGS "$testscript" >"$scratchdir/test.log" 2>&1
 
274
    "$TOOLDIR/"testrun $RUNSHFLAGS "$testscript" >"$scratchdir/test.log" 2>&1
269
275
    result=$?
270
276
    set -e
271
277