Re: [Xenomai-core] [patch] fix xeno-test for busybox

[Romain Lenglet <rlenglet@domain.hid>]

[-- Attachment #1: Type: text/plain, Size: 1536 bytes --]

Romain Lenglet wrote:
> Romain Lenglet wrote:
> > Gilles Chanteperdrix wrote:
> > > Jan Kiszka wrote:
> > >  > Jan Kiszka wrote:
> > >  > > Hi,
> > >  > >
> > >  > > I just tried to fire up xeno-test on a busybox system
> > >  > > - without success. Reason: missing getopts. But
> > >  > > busybox initial test checks for something else,
> > >  > > namely getopt. The attached patch should fix this it,
> > >  > > also taking into account that getopts in a shell
> > >  > > built-in, not an applet.
> > >  >
> > >  > Another quirk: switchtest runs with hard-wired -T
> > >  > 120...
> > >
> > > Could you try the attached patch ?
> >
> > Dumb question about your patch...
> > Shouldn't you keep the -T option in the $pass variable, to
> > pass it to latency?
> >
> >         T) timeout=$OPTARG
> >             pass="$pass -T $timeout" ;;
>
> The problem is that, if you don't put it in $pass, you must
> re-pass the latency option explicitly when logging, since it
> is no more in $pass, and is not in $loadpass. Otherwise,
>
> script -c "`dirname $0`/xeno-test $loadpass $pass $*" $wfile
>
> should become:
>
> script -c "`dirname $0`/xeno-test $loadpass $pass -T $latency
> $*" $wfile
>
>
> Therefore, I propose a slightly different patch. The -T option
> may be duplicated in $opts, but hopefully this is not a
> problem with the latency command?

A patch that avoid duplicating the -T option.

-- 
Romain LENGLET

-- 
Romain LENGLET
Pr. Chiba Shigeru Group
Dept. of Mathematical and Computing Sciences
Tokyo Institute of Technology

[-- Attachment #2: xeno-test-timeout.diff --]
[-- Type: text/x-diff, Size: 1717 bytes --]

--- xeno-test.in.orig	2006-09-13 15:49:31.000000000 +0900
+++ xeno-test.in	2006-09-13 15:58:13.000000000 +0900
@@ -24,6 +24,8 @@
   -v		verbose
   -M <email>	sends output to given addr
   -m		sends output to xenomai-data@domain.hid
+  -T <sec test> do not run each test for more than <sec test> seconds (defaults
+		to 120 seconds)
   -U <url>	uploads output to given URL
   -D <datefmt>	alternate options to date, for timestamp (dflt: 
 
@@ -31,7 +33,6 @@
   -s	print statistics of sampled data (default on)
   -h	print histogram of sampled data (default on, implies -s)
   -q	quiet, dont print 1 sec sampled data (default on, off if !-T)
-  -T <sec test>		 (default: 120 sec)
   -l <data/header lines> (default 21)
   -H <bucketcount>	 (default 100)
   -B <bucketsize ns>	 (default 1000 ns)
@@ -186,10 +187,13 @@
     fi
 }
 
+timeoutset=n
+timeout=120
 
 run_w_load() {
     local opts="$*";
-    [ "$opts"  = '' ] && opts='-sh -T 120'
+    [ "$opts"  = '' ] && opts='-sh'
+    [ "$timeoutset" = 'n' ] && opts="$opts -T $timeout"
 
     boxinfo
     loudly generate_loads $workload
@@ -201,7 +205,7 @@
 	loudly ./run -- $XENOT_LATENCY $opts -t2 '# latency'
     )
     (	cd `dirname $0`/../testsuite/switchtest
-	loudly ./run -- -T 120 $XENOT_SWITCHTEST '# switchtest'
+	loudly ./run -- -T $timeout $XENOT_SWITCHTEST '# switchtest'
     )
     (	cd `dirname $0`/../testsuite/switchbench
 	loudly ./run -- -h $XENOT_SWITCHBENCH '# switchbench'
@@ -280,9 +284,13 @@
 	# latency passthrus
 	s|h|q)
 	    pass="$pass -$FOO" ;;
-	T|l|H|B|p)
+	l|H|B|p)
 	    pass="$pass -$FOO $OPTARG" ;;
 
+	T) timeout=$OPTARG 
+	    timeoutset=y
+	    pass="$pass -T $timeout" ;;
+
 	# workload related
 	d) 
 	    device=$OPTARG