Hello community, here is the log from the commit of package dbench checked in at Thu Mar 6 00:33:21 CET 2008. -------- --- dbench/dbench.changes 2007-07-27 19:29:16.000000000 +0200 +++ dbench/dbench.changes 2008-03-03 20:03:49.000000000 +0100 @@ -1,0 +2,9 @@ +Mon Mar 3 18:48:58 CET 2008 - vmarsik@suse.cz + +- subpkg dbench-ctcs2-glue: now uses /tmp when /abuild not available +- subpkg dbench-ctcs2-glue: starts a series of 1,2,4,8,12,16,20,24,32,40,48,56,64,96,128,192,256,384,500 processes +- subpkg dbench-ctcs2-glue: every run now takes only the standard time of 120+600 seconds +- subpkg dbench-ctcs2-glue: old version still available under dbench-run-old + + +------------------------------------------------------------------- Old: ---- dodbench_spare_file fix-suse_cert-dependency.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dbench.spec ++++++ --- /var/tmp/diff_new_pack.y28300/_old 2008-03-06 00:32:22.000000000 +0100 +++ /var/tmp/diff_new_pack.y28300/_new 2008-03-06 00:32:22.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package dbench (Version 3.04) # -# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # @@ -10,19 +10,18 @@ # norootforbuild + Name: dbench License: GPL v2 or later Group: System/Benchmark -Autoreqprov: on +AutoReqProv: on Version: 3.04 -Release: 66 +Release: 100 Summary: File System Benchmark Similar to Netbench -URL: http://samba.org/ftp/tridge/dbench/ +Url: http://samba.org/ftp/tridge/dbench/ Source0: %{name}-%{version}.tar.bz2 Source1: %{name}-ctcstools.tar.bz2 Patch0: verbose.diff -Patch1: fix-suse_cert-dependency.patch -Patch2: dodbench_spare_file BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -58,8 +57,6 @@ %prep %setup -q -n %{name}-%{version} -a1 %patch0 -p1 -%patch1 -p1 -%patch2 %build CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=/usr --datadir=/usr/share/dbench @@ -78,9 +75,14 @@ install -m 744 ctcstools/do_dbench $RPM_BUILD_ROOT/usr/share/qa/dbench/ install -m 644 ctcstools/dbench-default.tcf $RPM_BUILD_ROOT/usr/share/qa/dbench/tcf ln -s ../../../../usr/share/qa/dbench/tcf/dbench-default.tcf $RPM_BUILD_ROOT/usr/share/qa/tcf +install -m 644 ctcstools/dbench-default-old.tcf $RPM_BUILD_ROOT/usr/share/qa/dbench/tcf +ln -s ../../../../usr/share/qa/dbench/tcf/dbench-default-old.tcf $RPM_BUILD_ROOT/usr/share/qa/tcf install -m 644 ctcstools/dbench-syncIO.tcf $RPM_BUILD_ROOT/usr/share/qa/dbench/tcf ln -s ../../../../usr/share/qa/dbench/tcf/dbench-syncIO.tcf $RPM_BUILD_ROOT/usr/share/qa/tcf +install -m 644 ctcstools/dbench-syncIO-old.tcf $RPM_BUILD_ROOT/usr/share/qa/dbench/tcf +ln -s ../../../../usr/share/qa/dbench/tcf/dbench-syncIO-old.tcf $RPM_BUILD_ROOT/usr/share/qa/tcf install -m 744 ctcstools/dbench-run $RPM_BUILD_ROOT/usr/lib/ctcs2/tools +install -m 744 ctcstools/dbench-run-old $RPM_BUILD_ROOT/usr/lib/ctcs2/tools find $RPM_BUILD_ROOT/usr/share/dbench -name "*.txt" -type f -print0 | xargs -r -0 chmod a-x %clean @@ -103,36 +105,41 @@ /usr/lib/ctcs2 %changelog -* Fri Jul 27 2007 - pkirsch@suse.de +* Mon Mar 03 2008 vmarsik@suse.cz +- subpkg dbench-ctcs2-glue: now uses /tmp when /abuild not available +- subpkg dbench-ctcs2-glue: starts a series of 1,2,4,8,12,16,20,24,32,40,48,56,64,96,128,192,256,384,500 processes +- subpkg dbench-ctcs2-glue: every run now takes only the standard time of 120+600 seconds +- subpkg dbench-ctcs2-glue: old version still available under dbench-run-old +* Fri Jul 27 2007 pkirsch@suse.de - dodbench_spare_file fixes the awk command for searching the size of the choosen dir. Now it can run on a spare file. -* Wed Feb 21 2007 - yxu@suse.de +* Wed Feb 21 2007 yxu@suse.de - merge several fixing_suse_cert_dependency patches into one file -* Thu Feb 08 2007 - yxu@suse.de +* Thu Feb 08 2007 yxu@suse.de - finished removing dependency on pkg suse_cert -* Mon Jan 29 2007 - yxu@suse.de +* Mon Jan 29 2007 yxu@suse.de - continued removing dependency on pkg suse_cert - fixed typo -* Fri Nov 10 2006 - ro@suse.de +* Fri Nov 10 2006 ro@suse.de - fix docu permissions -* Mon Feb 06 2006 - fseidel@suse.de +* Mon Feb 06 2006 fseidel@suse.de - removed dpendency on pkg suse_cert -* Wed Jan 25 2006 - mls@suse.de +* Wed Jan 25 2006 mls@suse.de - converted neededforbuild to BuildRequires -* Wed Dec 07 2005 - kgw@suse.de +* Wed Dec 07 2005 kgw@suse.de - subpkg dbench-ctcs2-glue: Added wrapper script do_dbench for some pre-test error checking - subpkg dbench-ctcs2-glue: adapted the *.tcf accordingly - subpkg dbench-ctcs2-glue: new: dependency on pkg suse-cert -* Tue Nov 15 2005 - ories@suse.de +* Tue Nov 15 2005 ories@suse.de - major update to 3.04 - moved clients.txt to /usr/share/dbench/ - added subpackage dbench-ctcs2-glue -* Thu Jun 30 2005 - meissner@suse.de +* Thu Jun 30 2005 meissner@suse.de - use RPM_OPT_FLAGS. -* Wed Jun 18 2003 - ro@suse.de +* Wed Jun 18 2003 ro@suse.de - added directory to filelist -* Wed Sep 18 2002 - ro@suse.de +* Wed Sep 18 2002 ro@suse.de - removed bogus self-provides -* Tue Dec 18 2001 - ories@suse.de +* Tue Dec 18 2001 ories@suse.de - initial package ++++++ dbench-ctcstools.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ctcstools/dbench-default-old.tcf new/ctcstools/dbench-default-old.tcf --- old/ctcstools/dbench-default-old.tcf 1970-01-01 01:00:00.000000000 +0100 +++ new/ctcstools/dbench-default-old.tcf 2005-12-05 16:19:45.000000000 +0100 @@ -0,0 +1,6 @@ +# run the default dbench test for 1 hour with 500 clients, including +# pre-check of feasibility of workdir and +# final tidy-up +# +fg 1 dbench_dflt /usr/share/qa/dbench/do_dbench -n 500 -t 3600 -D /abuild/dbench_dflt +wait diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ctcstools/dbench-default.tcf new/ctcstools/dbench-default.tcf --- old/ctcstools/dbench-default.tcf 2005-12-05 16:19:45.000000000 +0100 +++ new/ctcstools/dbench-default.tcf 2008-03-03 18:04:45.000000000 +0100 @@ -2,5 +2,85 @@ # pre-check of feasibility of workdir and # final tidy-up # -fg 1 dbench_dflt /usr/share/qa/dbench/do_dbench -n 500 -t 3600 -D /abuild/dbench_dflt + +# original version: +#fg 1 dbench_dflt /usr/share/qa/dbench/do_dbench -n 32 -t 3600 -D /abuild/dbench_dflt +#wait + +timer 750 +fg 1 dbench-default /usr/share/qa/dbench/do_dbench -n 1 wait + +timer 750 +fg 1 dbench-default /usr/share/qa/dbench/do_dbench -n 2 +wait + +timer 750 +fg 1 dbench-default /usr/share/qa/dbench/do_dbench -n 4 +wait + +timer 750 +fg 1 dbench-default /usr/share/qa/dbench/do_dbench -n 8 +wait + +timer 750 +fg 1 dbench-default /usr/share/qa/dbench/do_dbench -n 12 +wait + +timer 750 +fg 1 dbench-default /usr/share/qa/dbench/do_dbench -n 16 +wait + +timer 750 +fg 1 dbench-default /usr/share/qa/dbench/do_dbench -n 20 +wait + +timer 750 +fg 1 dbench-default /usr/share/qa/dbench/do_dbench -n 24 +wait + +timer 750 +fg 1 dbench-default /usr/share/qa/dbench/do_dbench -n 32 +wait + +timer 750 +fg 1 dbench-default /usr/share/qa/dbench/do_dbench -n 40 +wait + +timer 750 +fg 1 dbench-default /usr/share/qa/dbench/do_dbench -n 48 +wait + +timer 750 +fg 1 dbench-default /usr/share/qa/dbench/do_dbench -n 56 +wait + +timer 750 +fg 1 dbench-default /usr/share/qa/dbench/do_dbench -n 64 +wait + +timer 750 +fg 1 dbench-default /usr/share/qa/dbench/do_dbench -n 96 +wait + +timer 750 +fg 1 dbench-default /usr/share/qa/dbench/do_dbench -n 128 +wait + +timer 750 +fg 1 dbench-default /usr/share/qa/dbench/do_dbench -n 192 +wait + +timer 750 +fg 1 dbench-default /usr/share/qa/dbench/do_dbench -n 256 +wait + +timer 750 +fg 1 dbench-default /usr/share/qa/dbench/do_dbench -n 384 +wait + +timer 750 +fg 1 dbench-default /usr/share/qa/dbench/do_dbench -n 500 +wait + + diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ctcstools/dbench-run-old new/ctcstools/dbench-run-old --- old/ctcstools/dbench-run-old 1970-01-01 01:00:00.000000000 +0100 +++ new/ctcstools/dbench-run-old 2008-03-03 18:03:54.000000000 +0100 @@ -0,0 +1,9 @@ +#!/bin/sh + +ctcsdir="/usr/lib/ctcs2" +basedir="/usr/share/qa/dbench" + +$ctcsdir/tools/run $basedir/tcf/dbench-default-old.tcf +sleep 120 +$ctcsdir/tools/run $basedir/tcf/dbench-syncIO-old.tcf + diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ctcstools/dbench-syncIO-old.tcf new/ctcstools/dbench-syncIO-old.tcf --- old/ctcstools/dbench-syncIO-old.tcf 1970-01-01 01:00:00.000000000 +0100 +++ new/ctcstools/dbench-syncIO-old.tcf 2005-12-05 16:19:45.000000000 +0100 @@ -0,0 +1,6 @@ +# run dbench with synchronous IO for 1 hour with 500 clients, including +# pre-check of feasibility of workdir and +# final tidy-up +# +fg 1 dbench_syncIO /usr/share/qa/dbench/do_dbench -o "-s" -n 500 -t 3600 -D /abuild/dbench_syncIO +wait diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ctcstools/dbench-syncIO.tcf new/ctcstools/dbench-syncIO.tcf --- old/ctcstools/dbench-syncIO.tcf 2005-12-05 16:19:45.000000000 +0100 +++ new/ctcstools/dbench-syncIO.tcf 2008-03-03 18:04:52.000000000 +0100 @@ -2,5 +2,85 @@ # pre-check of feasibility of workdir and # final tidy-up # -fg 1 dbench_syncIO /usr/share/qa/dbench/do_dbench -o "-s" -n 500 -t 3600 -D /abuild/dbench_syncIO + +# original version: +#fg 1 dbench_syncIO /usr/share/qa/dbench/do_dbench -o "-s" -n 500 -t 3600 -D /abuild/dbench_syncIO +#wait + +timer 750 +fg 1 dbench-syncIO /usr/share/qa/dbench/do_dbench -o "-s" -n 1 wait + +timer 750 +fg 1 dbench-syncIO /usr/share/qa/dbench/do_dbench -o "-s" -n 2 +wait + +timer 750 +fg 1 dbench-syncIO /usr/share/qa/dbench/do_dbench -o "-s" -n 4 +wait + +timer 750 +fg 1 dbench-syncIO /usr/share/qa/dbench/do_dbench -o "-s" -n 8 +wait + +timer 750 +fg 1 dbench-syncIO /usr/share/qa/dbench/do_dbench -o "-s" -n 12 +wait + +timer 750 +fg 1 dbench-syncIO /usr/share/qa/dbench/do_dbench -o "-s" -n 16 +wait + +timer 750 +fg 1 dbench-syncIO /usr/share/qa/dbench/do_dbench -o "-s" -n 20 +wait + +timer 750 +fg 1 dbench-syncIO /usr/share/qa/dbench/do_dbench -o "-s" -n 24 +wait + +timer 750 +fg 1 dbench-syncIO /usr/share/qa/dbench/do_dbench -o "-s" -n 32 +wait + +timer 750 +fg 1 dbench-syncIO /usr/share/qa/dbench/do_dbench -o "-s" -n 40 +wait + +timer 750 +fg 1 dbench-syncIO /usr/share/qa/dbench/do_dbench -o "-s" -n 48 +wait + +timer 750 +fg 1 dbench-syncIO /usr/share/qa/dbench/do_dbench -o "-s" -n 56 +wait + +timer 750 +fg 1 dbench-syncIO /usr/share/qa/dbench/do_dbench -o "-s" -n 64 +wait + +timer 750 +fg 1 dbench-syncIO /usr/share/qa/dbench/do_dbench -o "-s" -n 96 +wait + +timer 750 +fg 1 dbench-syncIO /usr/share/qa/dbench/do_dbench -o "-s" -n 128 +wait + +timer 750 +fg 1 dbench-syncIO /usr/share/qa/dbench/do_dbench -o "-s" -n 192 +wait + +timer 750 +fg 1 dbench-syncIO /usr/share/qa/dbench/do_dbench -o "-s" -n 256 +wait + +timer 750 +fg 1 dbench-syncIO /usr/share/qa/dbench/do_dbench -o "-s" -n 384 +wait + +timer 750 +fg 1 dbench-syncIO /usr/share/qa/dbench/do_dbench -o "-s" -n 500 +wait + + diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ctcstools/do_dbench new/ctcstools/do_dbench --- old/ctcstools/do_dbench 2005-12-06 13:53:13.000000000 +0100 +++ new/ctcstools/do_dbench 2008-03-03 18:58:57.000000000 +0100 @@ -7,6 +7,8 @@ # + yes: launch dbench test # + no: exit 2 (= internal error in ctcs2) # +# Note: default workingdirectory is /abuild/dbench (when existing) +# otherwise fallback to /abuild and then to /tmp # # # Script is intended to be invoked from within ctcs2 which captures @@ -15,23 +17,24 @@ # # # +set +x exitcode=2 # (= internal error in ctcs2) -CERTLIB=/usr/lib/cert_tests.lib # dbench test constants -default_workdir=/abuild/dbench dbench_pid="" # for the time being diskspace_per_client=22 # MByte -number_clients=1000 -runtime=3600 # seconds +number_clients=64 +runtime=600 # seconds -# Collection of functions from time-honoured hardware certification -if [ -f "$CERTLIB" ] ; then - . "$CERTLIB" -else - >&2 echo -e "\a$0: Not found: needed $CERTLIB. Aborting..." - exit "$exitcode" -fi +# find an usable working directory +for A in /abuild/dbench /abuild /tmp +do + if [ -d $A ] + then + default_workdir=$A + break + fi +done # ============ START aux functions ============== @@ -68,7 +71,7 @@ # Guard against re-entrancy -- yes, it may cause a race invoked_tidy_up="yes" echo "$(date): Caught signal; waiting 15s for dbench childs..." - "$SLEEP" 15 + sleep 15 echo " Overall runtime: $SECONDS seconds." # This should be unnecessary: dbench itself will # remove $workdir upon termination... @@ -87,7 +90,7 @@ trap tidy_up 1 2 3 15 -timestamp="$(get_timestamp)" +timestamp="$(date '+%y%m%d.%H%M%S')" basename=dbench-"${timestamp}" workdir="$default_workdir" dbench_opts="" @@ -111,8 +114,7 @@ h) usage exit 0 ;; D) workdir=$OPTARG ;; - n) [ "$OPTARG" -ge 10 ] && \ - number_clients="$OPTARG" ;; + n) number_clients="$OPTARG" ;; o) dbench_opts="$dbench_opts $OPTARG" ;; t) runtime=$OPTARG ;; v) verbose=yes ;; @@ -151,7 +153,7 @@ } wtestfile="${workdir}/prepare_workdir.$$.$$" -echo "$wtestfile" > "$wtestfile" ; "$RM" "$wtestfile" || { +echo "$wtestfile" > "$wtestfile" ; rm "$wtestfile" || { echo "\ Working directory $workdir: Cannot create or remove files there (maybe filesystem full or read-only?) @@ -163,10 +165,10 @@ # abort in case of shortage # minfree="$((diskspace_per_client * number_clients))" # MByte -freespace="$("$DF" -m "$workdir" | "$AWK" '/^\/dev/{ print $4 }')" +freespace="$(df -m "$workdir" | awk '/^\//{ print $4 }')" # if empty, need to consult next line. -[ -n "$freespace" ] || freespace="$("$DF" "$workdir" |\ - "$AWK" '/^\/dev/{ getline ; print $3 }')" +[ -n "$freespace" ] || freespace="$(df "$workdir" |\ + awk '/^\/dev/{ getline ; print $3 }')" if [ "$?" -ne 0 -o -z "$freespace" ] then echo "\ @@ -178,7 +180,7 @@ if [ "$freespace" -lt "$minfree" ] then echo "\ -$DF shows less than the needed $minfree MByte +\"df\" shows less than the needed $minfree MByte available under $workdir . Aborting..." kill $$ # invokes tidy_up fi diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ctcstools/do_dbench,v new/ctcstools/do_dbench,v --- old/ctcstools/do_dbench,v 1970-01-01 01:00:00.000000000 +0100 +++ new/ctcstools/do_dbench,v 2008-02-18 13:51:11.000000000 +0100 @@ -0,0 +1,284 @@ +head 1.7; +access; +symbols; +locks + vmarsik:1.7; strict; +comment @# @; + + +1.7 +date 2008.02.18.12.51.11; author vmarsik; state Exp; +branches; +next 1.5; + +1.5 +date 2008.02.18.12.51.11; author vmarsik; state Exp; +branches; +next 1.1; + +1.1 +date 2008.02.18.12.51.10; author vmarsik; state Exp; +branches; +next ; + + +desc +@Original +@ + + +1.7 +log +@dodbench_spare_file +@ +text +@#!/bin/bash +# +# +# Feature request: +# - Check whether a sufficient amount of disk space is available +# (~22 MB/client * 1000 clients) +# + yes: launch dbench test +# + no: exit 2 (= internal error in ctcs2) +# +# +# +# Script is intended to be invoked from within ctcs2 which captures +# stdout in its logfile --> no need for an extra log +# +# +# +# +exitcode=2 # (= internal error in ctcs2) + +# dbench test constants +default_workdir=/abuild/dbench +dbench_pid="" # for the time being +diskspace_per_client=22 # MByte +number_clients=1000 +runtime=3600 # seconds + + + +# ============ START aux functions ============== +# + +function usage() { + echo " +Usage: $0 [-h] [-D workdir] [-n nprocs] [-o dbench_options] + [-t #secs] [-v] + + to run the \"dbench\" Benchmark on this host + and to create a nice log. + +Options: + -D Specify the working directory (and thus, implicitly, + the device) for dbench (default: $default_workdir) + -h Print this help text and exit successfully + -n Number of processes dbench should start + (must be >=10 to avoid bad input; default: $number_clients) + -o Specify a string of options to pass through to dbench + Default: -s (do synchronous file IO only) + -t specify dbench runtime of #secs (default: $runtime) seconds. + -v be verbose (currently a no-op) +" + return 0 +} + + +invoked_tidy_up="" +function tidy_up() { + + if [ -z "$invoked_tidy_up" ] + then + # Guard against re-entrancy -- yes, it may cause a race + invoked_tidy_up="yes" + echo "$(date): Caught signal; waiting 15s for dbench childs..." + sleep 15 + echo " Overall runtime: $SECONDS seconds." + # This should be unnecessary: dbench itself will + # remove $workdir upon termination... + # + # echo "Backgrounding removal of $workdir and terminating..." + # rm -rf "$workdir" & + popd >/dev/null 2>&1 + exit "$exitcode" + fi # $invoked_tidy_up +} +# +# ============ END aux functions ============== + +# Runtime measurement +SECONDS=0 + +trap tidy_up 1 2 3 15 + +timestamp="$(date '+%y%m%d.%H%M%S')" +basename=dbench-"${timestamp}" +workdir="$default_workdir" +dbench_opts="" +# usage: dbench [OPTIONS] nprocs +# options: +# -v show version +# -t timelimit run time in seconds (default 600) +# -D directory base directory to run in +# -c loadfile set location of the loadfile +# -s synchronous file IO +# -S synchronous directories (mkdir, unlink...) +# -x enable EA support +# -T options set socket options for tbench + +# ===== Evaluate and check the commandline ========= +# # +while getopts hD:n:o:t:v optchar ; do + + case "$optchar" in + + h) usage + exit 0 ;; + D) workdir=$OPTARG ;; + n) [ "$OPTARG" -ge 10 ] && \ + number_clients="$OPTARG" ;; + o) dbench_opts="$dbench_opts $OPTARG" ;; + t) runtime=$OPTARG ;; + v) verbose=yes ;; + + *) usage + exit "$exitcode" ;; + esac +done +shift $((OPTIND - 1)) +# # +# ==== END: Evaluate and check the commandline ====== + + +# ==== Preparation: Create the working directory ===== +# +# Make the path absolute +[ "$workdir" = "${workdir#/}" ] && workdir="${PWD}"/"$workdir" +if [ -e "$workdir" ] +then + [ -d "$workdir" ] || { + echo "\$workdir: ${workdir} is not a directory. Aborting..." + exit "$exitcode" + } +else + mkdir -p "$workdir" || { + echo "Could not create working directory $workdir. Aborting..." + kill $$ # invokes tidy_up + } +fi + +[ -r "$workdir" -a -w "$workdir" -a -x "$workdir" ] || { + echo "\ +prepare_workdir: Working directory $workdir: +Needed access rights rwx not all set. Aborting..." + kill $$ # invokes tidy_up + } + +wtestfile="${workdir}/prepare_workdir.$$.$$" +echo "$wtestfile" > "$wtestfile" ; rm "$wtestfile" || { + echo "\ +Working directory $workdir: +Cannot create or remove files there (maybe filesystem full or read-only?) +Aborting..." + kill $$ # invokes tidy_up + } + +# ==== Preparation: Check disk space below $workdir, = +# abort in case of shortage +# +minfree="$((diskspace_per_client * number_clients))" # MByte +freespace="$(df -m "$workdir" | awk '/^\//{ print $4 }')" +# if empty, need to consult next line. +[ -n "$freespace" ] || freespace="$(df "$workdir" |\ + awk '/^\/dev/{ getline ; print $3 }')" +if [ "$?" -ne 0 -o -z "$freespace" ] +then + echo "\ +Unable to determine free space (needed: $minfree MByte) +available under $workdir . Non-local filesystem, maybe? +Aborting..." + kill $$ # invokes tidy_up +fi +if [ "$freespace" -lt "$minfree" ] +then + echo "\ +\"df\" shows less than the needed $minfree MByte +available under $workdir . Aborting..." + kill $$ # invokes tidy_up +fi +# +# ==== END Preparation =============================== + + +# Now DO IT. +# Script will be terminated by signal, as I don't know +# about how/whether dbench will terminate by itself. +# +exitcode=0 +echo "$(date): Launching command: +dbench $dbench_opts -t $runtime -D $workdir $number_clients +Working directory and device: +$(df $workdir) +" +dbench $dbench_opts -t "$runtime" -D "$workdir" "$number_clients" +# This code is reached only if dbench runs to termination rather +# than gets signalled +exitcode="$?" +echo "dbench run completed; SIGTERMing myself for tidyup..." +kill $$ + + +@ + + +1.5 +log +@fix-suse_cert-dependency.patch +@ +text +@d158 1 +a158 1 +freespace="$(df -m "$workdir" | awk '/^\/dev/{ print $4 }')" +@ + + +1.1 +log +@Initial revision +@ +text +@a18 1 +CERTLIB=/usr/lib/cert_tests.lib +a26 7 +# Collection of functions from time-honoured hardware certification +if [ -f "$CERTLIB" ] ; then + . "$CERTLIB" +else + >&2 echo -e "\a$0: Not found: needed $CERTLIB. Aborting..." + exit "$exitcode" +fi +d63 1 +a63 1 + "$SLEEP" 15 +d82 1 +a82 1 +timestamp="$(get_timestamp)" +d132 1 +a132 1 + "$MKDIR" -p "$workdir" || { +d146 1 +a146 1 +echo "$wtestfile" > "$wtestfile" ; "$RM" "$wtestfile" || { +d158 1 +a158 1 +freespace="$("$DF" -m "$workdir" | "$AWK" '/^\/dev/{ print $4 }')" +d160 2 +a161 2 +[ -n "$freespace" ] || freespace="$("$DF" "$workdir" |\ + "$AWK" '/^\/dev/{ getline ; print $3 }')" +d173 1 +a173 1 +$DF shows less than the needed $minfree MByte +@ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org