Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(20)

Unified Diff: client/tests/unixbench/unixbench.patch

Issue 2001005: Fix unixbench. (Closed) Base URL: ssh://git@chromiumos-git/autotest.git
Patch Set: Created 10 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: client/tests/unixbench/unixbench.patch
diff --git a/client/tests/unixbench/unixbench.patch b/client/tests/unixbench/unixbench.patch
index a6b567a3b1f25fb06dae08cc4ce8aaf1415ebe91..e3aee89ea2bd63c14ce06fc71f6f5aa52a7de517 100644
--- a/client/tests/unixbench/unixbench.patch
+++ b/client/tests/unixbench/unixbench.patch
@@ -1,6 +1,41 @@
+diff -urN src/Run newsrc/Run
+--- src/Run 2006-05-17 14:24:46.000000000 -0700
++++ newsrc/Run 2010-05-07 19:02:43.000000000 -0700
+@@ -53,7 +53,7 @@
+ # You will need ...
+ # awk cat cc chmod comm cp date dc df echo ed expr
+ # kill ls make mkdir rm sed test time touch tty umask who
+-# AND /usr/bin/time
++# AND time
+ # to generate result indexes, you will also need ...
+ # join
+ #
+@@ -66,7 +66,7 @@
+ #
+ if [ -z "${FLAVOR-}" ]; then
+ # determine flavor of UNIX from number of lines generated by "time"
+- Fcount=`/usr/bin/time date 2>&1 | wc -l | sed 's/ //g'`
++ Fcount=`time date 2>&1 | wc -l | sed 's/ //g'`
+ case "$Fcount" in
+ 2) FLAVOR=BSD ;;
+ 3) FLAVOR=Linux ;;
+@@ -468,10 +468,10 @@
+ ############ THE BENCH IS TIMED ##############
+ if [ -z "${stdin-}" ]; then
+ # without redirected stdin
+- /usr/bin/time $prog $opt $bg 2>>$TMPTIMES >>$stdout
++ time $prog $opt $bg 2>>$TMPTIMES >>$stdout
+ else
+ # with redirected stdin
+- /usr/bin/time $prog $opt $bg <$stdin 2>>$TMPTIMES >>$stdout
++ time $prog $opt $bg <$stdin 2>>$TMPTIMES >>$stdout
+ fi
+ ###############################################
+ cd $pwd # move back home
+diff -urN src/src/execl.c newsrc/src/execl.c
--- src/src/execl.c 1999-07-28 14:46:58.000000000 -0700
-+++ newsrc/src/execl.c 2008-02-27 09:23:17.372306000 -0800
-@@ -88,7 +88,7 @@ char *argv[];
++++ newsrc/src/execl.c 2010-05-07 19:01:38.000000000 -0700
+@@ -88,7 +88,7 @@
fprintf(stderr, "%lu loops\n", iter);
exit(0);
}
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698