qemu-iotests: common.rc: drop unused _do()
_do() was never used and possibly creates temporary files at predictable, world-writable locations. Get rid of it. Signed-off-by: Sascha Silbe <silbe@linux.vnet.ibm.com> Reviewed-by: Bo Tu <tubo@linux.vnet.ibm.com> Message-id: 1460472980-26319-3-git-send-email-silbe@linux.vnet.ibm.com Reviewed-by: Max Reitz <mreitz@redhat.com> Signed-off-by: Max Reitz <mreitz@redhat.com>
This commit is contained in:
		
							parent
							
								
									242fbc19ef
								
							
						
					
					
						commit
						6bb6f6cd9e
					
				@ -287,52 +287,6 @@ _need_to_be_root()
 | 
			
		||||
    fi
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
# Do a command, log it to $seq.full, optionally test return status
 | 
			
		||||
# and die if command fails. If called with one argument _do executes the
 | 
			
		||||
# command, logs it, and returns its exit status. With two arguments _do
 | 
			
		||||
# first prints the message passed in the first argument, and then "done"
 | 
			
		||||
# or "fail" depending on the return status of the command passed in the
 | 
			
		||||
# second argument. If the command fails and the variable _do_die_on_error
 | 
			
		||||
# is set to "always" or the two argument form is used and _do_die_on_error
 | 
			
		||||
# is set to "message_only" _do will print an error message to
 | 
			
		||||
# $seq.out and exit.
 | 
			
		||||
 | 
			
		||||
_do()
 | 
			
		||||
{
 | 
			
		||||
    if [ $# -eq 1 ]; then
 | 
			
		||||
        _cmd=$1
 | 
			
		||||
    elif [ $# -eq 2 ]; then
 | 
			
		||||
        _note=$1
 | 
			
		||||
        _cmd=$2
 | 
			
		||||
        echo -n "$_note... "
 | 
			
		||||
    else
 | 
			
		||||
        echo "Usage: _do [note] cmd" 1>&2
 | 
			
		||||
        status=1; exit
 | 
			
		||||
    fi
 | 
			
		||||
 | 
			
		||||
    (eval "echo '---' \"$_cmd\"") >>"$OUTPUT_DIR/$seq.full"
 | 
			
		||||
    (eval "$_cmd") >$tmp._out 2>&1; ret=$?
 | 
			
		||||
    cat $tmp._out >>"$OUTPUT_DIR/$seq.full"
 | 
			
		||||
    if [ $# -eq 2 ]; then
 | 
			
		||||
        if [ $ret -eq 0 ]; then
 | 
			
		||||
            echo "done"
 | 
			
		||||
        else
 | 
			
		||||
            echo "fail"
 | 
			
		||||
        fi
 | 
			
		||||
    fi
 | 
			
		||||
    if [ $ret -ne 0  ] \
 | 
			
		||||
        && [ "$_do_die_on_error" = "always" \
 | 
			
		||||
            -o \( $# -eq 2 -a "$_do_die_on_error" = "message_only" \) ]
 | 
			
		||||
    then
 | 
			
		||||
        [ $# -ne 2 ] && echo
 | 
			
		||||
        eval "echo \"$_cmd\" failed \(returned $ret\): see $seq.full"
 | 
			
		||||
        status=1; exit
 | 
			
		||||
    fi
 | 
			
		||||
 | 
			
		||||
    return $ret
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
# bail out, setting up .notrun file
 | 
			
		||||
#
 | 
			
		||||
_notrun()
 | 
			
		||||
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user