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

Side by Side 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 unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 diff -urN src/Run newsrc/Run
2 --- src/Run 2006-05-17 14:24:46.000000000 -0700
3 +++ newsrc/Run 2010-05-07 19:02:43.000000000 -0700
4 @@ -53,7 +53,7 @@
5 # You will need ...
6 # awk cat cc chmod comm cp date dc df echo ed expr
7 # kill ls make mkdir rm sed test time touch tty umask who
8 -# AND /usr/bin/time
9 +# AND time
10 # to generate result indexes, you will also need ...
11 # join
12 #
13 @@ -66,7 +66,7 @@
14 #
15 if [ -z "${FLAVOR-}" ]; then
16 # determine flavor of UNIX from number of lines generated by "time"
17 - Fcount=`/usr/bin/time date 2>&1 | wc -l | sed 's/ //g'`
18 + Fcount=`time date 2>&1 | wc -l | sed 's/ //g'`
19 case "$Fcount" in
20 2) FLAVOR=BSD ;;
21 3) FLAVOR=Linux ;;
22 @@ -468,10 +468,10 @@
23 ############ THE BENCH IS TIMED ##############
24 if [ -z "${stdin-}" ]; then
25 # without redirected stdin
26 - /usr/bin/time $prog $opt $bg 2>>$TMPTIMES >>$stdout
27 + time $prog $opt $bg 2>>$TMPTIMES >>$stdout
28 else
29 # with redirected stdin
30 - /usr/bin/time $prog $opt $bg <$stdin 2>>$TMPTIMES >>$stdout
31 + time $prog $opt $bg <$stdin 2>>$TMPTIMES >>$stdout
32 fi
33 ###############################################
34 cd $pwd # move back home
35 diff -urN src/src/execl.c newsrc/src/execl.c
1 --- src/src/execl.c 1999-07-28 14:46:58.000000000 -0700 36 --- src/src/execl.c 1999-07-28 14:46:58.000000000 -0700
2 +++ newsrc/src/execl.c» 2008-02-27 09:23:17.372306000 -0800 37 +++ newsrc/src/execl.c» 2010-05-07 19:01:38.000000000 -0700
3 @@ -88,7 +88,7 @@ char» *argv[]; 38 @@ -88,7 +88,7 @@
4 fprintf(stderr, "%lu loops\n", iter); 39 fprintf(stderr, "%lu loops\n", iter);
5 exit(0); 40 exit(0);
6 } 41 }
7 - execl(fullpath, fullpath, "0", dur_str, count_str, start_str, 0); 42 - execl(fullpath, fullpath, "0", dur_str, count_str, start_str, 0);
8 + execl(fullpath, fullpath, "0", dur_str, count_str, start_str, (char *)0) ; 43 + execl(fullpath, fullpath, "0", dur_str, count_str, start_str, (char *)0) ;
9 printf("Exec failed at iteration %lu\n", iter); 44 printf("Exec failed at iteration %lu\n", iter);
10 perror("Reason"); 45 perror("Reason");
11 exit(1); 46 exit(1);
OLDNEW
« 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