From: Enrico Scholz Date: Sat, 19 Mar 2005 02:06:14 +0000 (+0000) Subject: cleanups X-Git-Tag: IPSENTINEL_VERSION_0_12~57 X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4c31aca0e906217d3d4fc1e6f139727e523b0f64;p=util-vserver.git cleanups conditionalize expensive tests git-svn-id: http://svn.linux-vserver.org/svn/util-vserver/trunk@1937 94cd875c-1c1d-0410-91d2-eb244daf1a30 --- diff --git a/util-vserver/lib_internal/testsuite/copy-check b/util-vserver/lib_internal/testsuite/copy-check index a70edf4..7730e41 100755 --- a/util-vserver/lib_internal/testsuite/copy-check +++ b/util-vserver/lib_internal/testsuite/copy-check @@ -19,7 +19,7 @@ set -e dir=$(mktemp -d ${TMP:-/var/tmp}/copy-check.XXXXXX) -trap "ls -l $dir; rm -rf $dir" EXIT +trap "rm -rf $dir" EXIT COPY=${libinternaltestsuitedir:-$(dirname "$0")}/copy @@ -28,7 +28,7 @@ test -x "$COPY" function doit() { $COPY $dir/$nr-in $dir/$nr-out - cmp -s $dir/$nr-in $dir/$nr-out + LANG=C cmp -s $dir/$nr-in $dir/$nr-out } ## Usage: execCheck [*] @@ -68,7 +68,10 @@ execCheck 07 bs=4099 count=1 seek=1 execCheck 08 bs=4100 count=1 seek=1 ### Check 9: huge sparse file copy -execCheck 09 bs=1024 count=1 seek=$[ 1024*1024 * 5 ] +test x"$ensc_use_expensive_tests" != xyes || + execCheck 09 bs=1024 count=1 seek=$[ 1024*1024 * 5 ] -# ls -l $dir/* -# du $dir/* \ No newline at end of file +test x"$ensc_test_debug" != xyes || { + ls -l $dir/* + du $dir/* +} \ No newline at end of file