shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2024-10-28 03:27:58 +03:00
Code Releases Activity

test: Improve IO handling in the runner.

Browse Source
This commit is contained in:
Petr Rockai 2014-06-27 01:23:02 +02:00
parent 8c8fb67fc2
commit efb3e7ca00
1 changed files with 28 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
test/lib/runner.cpp
View File

@ -108,6 +108,7 @@ struct TestCase {
TestProcess child;
std::string name, flavour;
IO io;
BufSink *iobuf;
struct rusage usage;
int status;
@ -162,6 +163,7 @@ struct TestCase {
waitpid( pid, &status, 0 );
}
timeout = true;
io.sync();
return false;
}
@ -179,6 +181,7 @@ struct TestCase {
if ( select( io.fd + 1, &set, NULL, NULL, &wait ) > 0 )
silent_start = end; /* something happened */
usleep(500000);
io.sync();
return true;
@ -215,8 +218,16 @@ struct TestCase {
void parent()
{
::close( child.fd );
setupIO();
journal->started( id() );
silent_start = start = time( 0 );
progress( First ) << tag( "running" ) << pretty() << std::flush;
if ( options.verbose || options.interactive )
progress() << std::endl;
while ( monitor() );
Journal::R r = Journal::UNKNOWN;
@ -243,8 +254,12 @@ struct TestCase {
close(fd_debuglog);
} */
if ( iobuf && r == Journal::FAILED || r == Journal::TIMEOUT )
iobuf->dump( std::cout );
journal->done( id(), r );
progress( Last ) << tag( r ) << pretty() << std::endl;
io.clear();
}
void run() {
@ -258,21 +273,26 @@ struct TestCase {
setenv("LVM_TEST_FLAVOUR", flavour.c_str(), 1);
child.exec();
} else {
::close( child.fd );
journal->started( id() );
progress( First ) << tag( "running" ) << pretty() << std::flush;
if ( options.verbose || options.interactive )
progress() << std::endl;
start = time( 0 );
parent();
}
}
void setupIO() {
iobuf = 0;
if ( options.verbose )
io.sinks.push_back( new FdSink( 1 ) );
else
io.sinks.push_back( iobuf = new BufSink() );
std::string n = id();
std::replace( n.begin(), n.end(), '/', '_' );
std::string fn = options.outdir + "/" + n + ".txt";
io.sinks.push_back( new FileSink( fn ) );
}
TestCase( Journal &j, Options opt, std::string path, std::string name, std::string flavour )
: timeout( false ), child( path ), name( name ), flavour( flavour ), options( opt ), journal( &j )
{
if ( opt.verbose )
io.sinks.push_back( new FdSink( 1 ) );
}
};