File fix-suse_cert-dependency.patch of Package dbench

Overview Repositories Revisions Requests Users Attributes Meta

File fix-suse_cert-dependency.patch of Package dbench (Revision b325f38a7f76388e762233d111c149fd)

Currently displaying revision b325f38a7f76388e762233d111c149fd , Show latest

diff -pur dbench-3.04-orig/ctcstools/do_dbench dbench-3.04/ctcstools/do_dbench
--- dbench-3.04-orig/ctcstools/do_dbench	2007-02-21 16:19:11.000000000 +0100
+++ dbench-3.04/ctcstools/do_dbench	2007-02-21 16:31:09.000000000 +0100
@@ -16,7 +16,6 @@
 #
 #
 exitcode=2 #  (= internal error in ctcs2) 
-CERTLIB=/usr/lib/cert_tests.lib
 
 # dbench test constants
 default_workdir=/abuild/dbench
@@ -25,13 +24,6 @@ diskspace_per_client=22  # MByte
 number_clients=1000
 runtime=3600             # 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
 
 
 #  ============   START  aux functions  ==============
@@ -68,7 +60,7 @@ function tidy_up() {
 		# 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 +79,7 @@ SECONDS=0
 
 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=""
@@ -137,7 +129,7 @@ then
 	exit "$exitcode"
 	}
 else
-    "$MKDIR" -p "$workdir" || {
+    mkdir -p "$workdir" || {
          echo "Could not create working directory $workdir. Aborting..."
 	kill $$  # invokes tidy_up
 	}
@@ -151,7 +143,7 @@ Needed access rights rwx not all set. Ab
 	}
 
 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 +155,10 @@ Aborting..."
 #                      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 '/^\/dev/{ 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 +170,7 @@ fi
 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

Places

File fix-suse_cert-dependency.patch of Package dbench (Revision b325f38a7f76388e762233d111c149fd)

Places