"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "config/adb.exp" between
dejagnu-1.6.tar.gz and dejagnu-1.6.1.tar.gz

About: DejaGnu is a framework for testing other programs.

adb.exp  (dejagnu-1.6):adb.exp  (dejagnu-1.6.1)
# Copyright (C) 2013 Free Software Foundation, Inc. # Copyright (C) 2013-2016 Free Software Foundation, Inc.
# #
# This file is part of DejaGnu. # This file is part of DejaGnu.
# #
# DejaGnu is free software; you can redistribute it and/or modify it # DejaGnu is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by # under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or # the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version. # (at your option) any later version.
# #
# DejaGnu is distributed in the hope that it will be useful, but # DejaGnu is distributed in the hope that it will be useful, but
# WITHOUT ANY WARRANTY; without even the implied warranty of # WITHOUT ANY WARRANTY; without even the implied warranty of
skipping to change at line 166 skipping to change at line 166
set inp "" set inp ""
} }
# If CMD sends any output to stderr, exec will think it failed. More often # If CMD sends any output to stderr, exec will think it failed. More often
# than not that will be true, but it doesn't catch the case where there is # than not that will be true, but it doesn't catch the case where there is
# no output but the exit code is non-zero. # no output but the exit code is non-zero.
if { $inp == "" } { if { $inp == "" } {
set inp "/dev/null" set inp "/dev/null"
} }
verbose "Executing on $boardname:$cmd $pargs < $inp " verbose "Executing on $boardname: $cmd $pargs < $inp"
# Execute commands only from temporary folder, therefore do "cd" first # Execute commands only from temporary folder, therefore do "cd" first
global android_tmp_dir global android_tmp_dir
set status [catch "exec cat $inp | adb [adb_serial] shell cd $android_tmp_di r \&\& \( $cmd $pargs \) \\; echo XYZ\\\$\\\{\?\\\}ZYX |& cat" output] set status [catch "exec cat $inp | adb [adb_serial] shell cd $android_tmp_di r \&\& \( $cmd $pargs \) \\; echo XYZ\\\$\\\{\?\\\}ZYX |& cat" output]
# `status' doesn't mean much here other than adb worked ok. # `status' doesn't mean much here other than adb worked ok.
# What we want is whether $cmd ran ok. # What we want is whether $cmd ran ok.
if { $status != 0 } { if { $status != 0 } {
regsub "XYZ(\[0-9\]*)ZYX\n?" $output "" output regsub "XYZ(\[0-9\]*)ZYX\n?" $output "" output
return [list -1 "adb to $boardname failed for $cmd, $output"] return [list -1 "adb to $boardname failed for $cmd, $output"]
 End of changes. 2 change blocks. 
2 lines changed or deleted 2 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)