shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2024-12-21 13:34:40 +03:00
Code Releases Activity

tests: do not leak in mem in destructor

Browse Source
This commit is contained in:
Zdenek Kabelac 2015-03-11 15:41:53 +01:00
parent e7e499e80f
commit bdf4e3e2f2
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
test/lib/brick-shelltest.h
View File

@ -625,14 +625,15 @@ struct IO : Sink {
return *new (this) IO( io );
}
void clear() {
void clear(int push = 1) {
for ( Sinks::iterator i = sinks.begin(); i != sinks.end(); ++i )
delete *i;
sinks.clear();
sinks.push_back( _observer = new Observer );
if (push)
sinks.push_back( _observer = new Observer );
}
~IO() { close(); clear(); }
~IO() { close(); clear(0); }
};
@ -659,7 +660,7 @@ struct TestProcess
bool interactive;
int fd;
void exec() {
void exec() __attribute__ ((noreturn)) {
assert( fd >= 0 );
if ( !interactive ) {
int devnull = ::open( "/dev/null", O_RDONLY );
@ -858,7 +859,8 @@ struct TestCase {
if ( options.verbose || options.interactive )
progress() << std::endl;
while ( monitor() );
while ( monitor() )
/* empty */ ;
Journal::R r = Journal::UNKNOWN;