packages: unixbench/unixbench-dirs.patch, unixbench/unixbench.sh, unixbench...

[sls]

Author: sls                          Date: Sat Jun  9 21:33:04 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- reviewed R/S/BR
- updated TODO
- building ubgears test util
- more fixes in dirs.patch
- removed useless copying in unixbench.sh wrapper
- rel. 0.10

---- Files affected:
packages/unixbench:
   unixbench-dirs.patch (1.2 -> 1.3) , unixbench.sh (1.1 -> 1.2) , unixbench.spec (1.22 -> 1.23) 

---- Diffs:

================================================================
Index: packages/unixbench/unixbench-dirs.patch
diff -u packages/unixbench/unixbench-dirs.patch:1.2 packages/unixbench/unixbench-dirs.patch:1.3
--- packages/unixbench/unixbench-dirs.patch:1.2	Tue Jun  5 18:20:45 2012
+++ packages/unixbench/unixbench-dirs.patch	Sat Jun  9 23:32:59 2012
@@ -11,6 +11,33 @@
  rm sort.$$ grep.$$ od.$$ wc.$$
 --- UnixBench/Run.orig	2012-06-05 14:41:53.016735725 +0200
 +++ UnixBench/Run	2012-06-05 14:42:19.356633000 +0200
+@@ -434,7 +434,7 @@
+         "logmsg" => "C Compiler Throughput ($cCompiler)",
+         "cat"    => 'misc',
+         "prog" => "${BINDIR}/looper",
+-        "options" => "60 $cCompiler cctest.c",
++        "options" => "60 $cCompiler ${BINDIR}/cctest.c",
+     },
+     "arithoh" => {
+         "logmsg" => "Arithoh",
+@@ -471,7 +471,7 @@
+         "cat"    => 'misc',
+         "prog" => "${BINDIR}/looper",
+         "options" => "30 dc",
+-        "stdin" => "dc.dat",
++        "stdin" => "${BINDIR}/dc.dat",
+     },
+     "hanoi" => {
+         "logmsg" => "Recursion Test -- Tower of Hanoi",
+@@ -482,7 +482,7 @@
+         "logmsg" => "Grep a large file (system's grep)",
+         "cat"    => 'misc',
+         "prog" => "${BINDIR}/looper",
+-        "options" => "30 grep -c gimp large.txt",
++        "options" => "30 grep -c gimp ${BINDIR}/large.txt",
+     },
+     "sysexec" => {
+         "logmsg" => "Exec System Call Overhead",
 @@ -784,15 +784,6 @@
      # Set the language.
      $ENV{'LANG'} = $language;

================================================================
Index: packages/unixbench/unixbench.sh
diff -u packages/unixbench/unixbench.sh:1.1 packages/unixbench/unixbench.sh:1.2
--- packages/unixbench/unixbench.sh:1.1	Tue Jun  5 18:20:45 2012
+++ packages/unixbench/unixbench.sh	Sat Jun  9 23:32:59 2012
@@ -4,5 +4,4 @@
 export UB_TMPDIR=$WORKDIR
 export UB_RESULTDIR=$WORKDIR
 export UB_TESTDIR=$WORKDIR
-cp $UB_BINDIR/sort.src $UB_TESTDIR
 $UB_BINDIR/Run $@

================================================================
Index: packages/unixbench/unixbench.spec
diff -u packages/unixbench/unixbench.spec:1.22 packages/unixbench/unixbench.spec:1.23
--- packages/unixbench/unixbench.spec:1.22	Wed Jun  6 00:14:09 2012
+++ packages/unixbench/unixbench.spec	Sat Jun  9 23:32:59 2012
@@ -1,13 +1,15 @@
 # $Revision$, $Date$
 # TODO:
-#	- review Requires/Suggests for default/optional tests
+#	- do something sane with temporary dir (rm but save test results/logs)
+#
+%bcond_without	x11		# build graphics test
 #
 %define		relname		UnixBench
 Summary:	Unix Bench
 Summary(pl.UTF-8):	Unix Bench
 Name:		unixbench
 Version:	5.1.3
-Release:	0.9
+Release:	0.10
 License:	GPL v2
 Group:		Applications/System
 Source0:	http://byte-unixbench.googlecode.com/files/%{relname}%{version}.tgz
@@ -15,18 +17,20 @@
 Source1:	%{name}.sh
 Patch0:		%{name}-dirs.patch
 URL:		http://code.google.com/p/byte-unixbench/
-Requires:	bc
-Requires:	ed
-Requires:	file
-Requires:	fileutils
-Requires:	gcc
-Requires:	make
-Requires:	mawk
+%{?with_x11:BuildRequires:	xorg-lib-libX11-devel}
+%{?with_x11:BuildRequires:	xorg-lib-libXext-devel}
+%{?with_x11:BuildRequires:	OpenGL-devel}
 Requires:	mktemp
-Requires:	sed
-Requires:	sh-utils
-Requires:	textutils
-Requires:	time
+Requires:	perl(Time::HiRes)
+# grep test
+Suggests:	grep
+# C test
+Suggests:	gcc
+Suggests:	glibc-devel
+# dc test
+Suggests:	bc
+# graphics test
+Suggests:	xorg-app-x11perf
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -43,7 +47,8 @@
 
 %build
 rm -f pgms/select
-%{__make} -j 1
+
+%{__make} -j 1 %{?with_x11:GRAPHIC_TESTS=1}
 %{__make} pgms/{poll,select}
 
 %install
@@ -69,6 +74,7 @@
 %attr(755,root,root) %{_libdir}/unixbench/int
 %attr(755,root,root) %{_libdir}/unixbench/Run
 %attr(755,root,root) %{_libdir}/unixbench/s[ehpy]*
+%{?with_x11:%attr(755,root,root) %{_libdir}/unixbench/ubgears}
 %{_libdir}/unixbench/cctest.c
 %{_libdir}/unixbench/dc.dat
 %{_libdir}/unixbench/index.[ab]*
@@ -81,6 +87,14 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.23  2012/06/09 21:32:59  sls
+- reviewed R/S/BR
+- updated TODO
+- building ubgears test util
+- more fixes in dirs.patch
+- removed useless copying in unixbench.sh wrapper
+- rel. 0.10
+
 Revision 1.22  2012/06/05 22:14:09  sls
 - fix (s/BR/R/) in changelog
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/packages/unixbench/unixbench-dirs.patch?r1=1.2&r2=1.3
    http://cvs.pld-linux.org/packages/unixbench/unixbench.sh?r1=1.1&r2=1.2
    http://cvs.pld-linux.org/packages/unixbench/unixbench.spec?r1=1.22&r2=1.23