maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[compiler-rt] Fix %device_rundir test substitution 

"/" needs to be removed to avoid making absolute path.
This commit is contained in:
Vitaly Buka 2021-07-20 17:37:36 -07:00
parent be8738324c
commit 7f7fb2ef5d
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
compiler-rt/test/lit.common.cfg.py
View File

@ -447,7 +447,7 @@ if config.android:
# These are needed for tests to upload/download temp files, such as
# suppression-files, to device.
config.substitutions.append( ('%device_rundir', "/data/local/tmp/Output") )
config.substitutions.append( ('%device_rundir/', "/data/local/tmp/Output/") )
config.substitutions.append( ('%push_to_device', "%s -s '%s' push " % (adb, env['ANDROID_SERIAL']) ) )
config.substitutions.append( ('%pull_from_device', "%s -s '%s' pull " % (adb, env['ANDROID_SERIAL']) ) )
config.substitutions.append( ('%adb_shell ', "%s -s '%s' shell " % (adb, env['ANDROID_SERIAL']) ) )
@ -476,7 +476,7 @@ if config.android:
for file in config.android_files_to_push:
subprocess.check_call([adb, "push", file, android_tmpdir], env=env)
else:
config.substitutions.append( ('%device_rundir', "") )
config.substitutions.append( ('%device_rundir/', "") )
config.substitutions.append( ('%push_to_device', "echo ") )
config.substitutions.append( ('%pull_from_device', "echo ") )
config.substitutions.append( ('%adb_shell', "echo ") )