sascha/devlib
1
0
Fork 0
mirror of https://github.com/ARM-software/devlib.git synced 2025-04-04 08:50:04 +01:00
Code Issues Releases Wiki Activity

Gem5Connection: Correct pull method

Browse Source 
The pull method used when connecting to gem5 uses the 'm5 writefile'.
This only works if the file to pulled in, is in the current working directory
on the target. The file therefore might need to be copied on the target, from its
original location to the working directory.
The previous implemention of this was incorrect and used information about the
current working directory on the host.
This commit is contained in:
Anouk Van Laer 2017-05-17 15:49:20 +01:00
parent 69a83d4128
commit 35987d5281
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
devlib/utils/ssh.py
View File

@ -442,11 +442,14 @@ class Gem5Connection(TelnetConnection):
filename = os.path.basename(source)
logger.debug("pull_file {} {}".format(source, filename))
# writefile needs the file to be copied to be in the current working
# directory so if needed, copy to the working directory
# We don't check the exit code here because it is non-zero if the source
# and destination are the same. The ls below will cause an error if the
# file was not where we expected it to be.
if os.path.dirname(source) != os.getcwd():
self._gem5_shell("cat '{}' > '{}'".format(source, filename))
if os.path.isabs(source):
if os.path.dirname(source) != self.execute('pwd',check_exit_code=False):
self._gem5_shell("cat '{}' > '{}'".format(source, filename))
self._gem5_shell("sync")
self._gem5_shell("ls -la {}".format(filename))
logger.debug('Finished the copy in the simulator')