Merging upstream version 1.2~pre2.
Signed-off-by: Daniel Baumann <daniel@debian.org>
This commit is contained in:
parent
f9513766bb
commit
efa0d5eefe
22 changed files with 804 additions and 87 deletions
|
@ -338,7 +338,7 @@ int test_format( const int infd, const uint8_t ** const magic_datap,
|
|||
|
||||
|
||||
int wait_for_child( const pid_t pid, const char * const name,
|
||||
const int eretval )
|
||||
const int eretval, const bool isgzxz )
|
||||
{
|
||||
int status;
|
||||
while( waitpid( pid, &status, 0 ) == -1 )
|
||||
|
@ -355,7 +355,7 @@ int wait_for_child( const pid_t pid, const char * const name,
|
|||
if( WIFEXITED( status ) )
|
||||
{
|
||||
const int tmp = WEXITSTATUS( status );
|
||||
if( eretval == 1 && tmp == 1 ) return 2; // for ztest
|
||||
if( isgzxz && eretval == 1 && tmp == 1 ) return 2; // for ztest
|
||||
return tmp;
|
||||
}
|
||||
return eretval;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue