- so = testbed.scratch.append('stdout-' + t.tname, 'stdout-' + t.tname)
- se = testbed.scratch.append('stdout-' + t.tname, 'stdout-' + t.tname)
+ def stdouterr(oe):
+ idstr = oe + '-' + t.tname
+ print 'stdouterr', oe, idstr, opts.output_dir
+ if opts.output_dir is not None and opts.output_dir.tb:
+ return opts.output_dir.append(idstr)
+ else:
+ return testbed.scratch.append(idstr, idstr)
+ def stdouterrh(p, oe):
+ idstr = oe + '-' + t.tname
+ if opts.output_dir is None or opts.output_dir.tb:
+ return p.onhost()
+ else:
+ return p.onhost(opts.output_dir.onhost() + '/' + idstr)
+ so = stdouterr('stdout')
+ print 'so', so
+ se = stdouterr('stderr')
+ print 'commandr1', t.p, so, se