diff options
| author | Ben Elliston <bje@gnu.org> | 2013-12-10 16:46:15 +1100 |
|---|---|---|
| committer | Ben Elliston <bje@gnu.org> | 2013-12-10 16:46:15 +1100 |
| commit | 93f2fec5947c3e4ff764e9b92f60647847eeb690 (patch) | |
| tree | e87bebfadf40a045c5faeed4e6dd2f71b2f1a639 /config | |
| parent | a78bb783097d8a32dbaa0fe4f3a0d20297e5da15 (diff) | |
| parent | bcc1f7e6ef8d1cb497f69924c39f454b9ea3583c (diff) | |
| download | dejagnu-93f2fec5947c3e4ff764e9b92f60647847eeb690.zip dejagnu-93f2fec5947c3e4ff764e9b92f60647847eeb690.tar.gz dejagnu-93f2fec5947c3e4ff764e9b92f60647847eeb690.tar.bz2 | |
Merge branch 'master' of git.sv.gnu.org:/srv/git/dejagnu
Diffstat (limited to 'config')
| -rw-r--r-- | config/adb.exp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/config/adb.exp b/config/adb.exp index a679e6a..b5e5d6c 100644 --- a/config/adb.exp +++ b/config/adb.exp @@ -128,7 +128,7 @@ proc adb_file {dest op args} { } proc adb_upload {desthost srcfile destfile} { - set status [catch "exec adb [adb_serial] pull $srcfile $destfile" output] + set status [catch "exec adb [adb_serial] pull $srcfile $destfile |& cat" output] if { $status == 0 } { verbose "Copied $srcfile to $destfile" 2 return $destfile @@ -165,7 +165,9 @@ proc adb_exec { boardname cmd args } { verbose "Executing $boardname:$cmd $pargs < $inp " - set status [catch "exec cat $inp | adb [adb_serial] shell \( $cmd $pargs \) \\; echo XYZ\\\$\\\{\?\\\}ZYX |& cat" output] + # Execute commands only from temporary folder, therefore do "cd" first + global android_tmp_dir + set status [catch "exec cat $inp | adb [adb_serial] shell cd $android_tmp_dir \&\& \( $cmd $pargs \) \\; echo XYZ\\\$\\\{\?\\\}ZYX |& cat" output] # `status' doesn't mean much here other than adb worked ok. # What we want is whether $cmd ran ok. |