Skip to content

Commit 7f7fb2e

Browse files
committed
[compiler-rt] Fix %device_rundir test substitution
"/" needs to be removed to avoid making absolute path.
1 parent be87383 commit 7f7fb2e

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

compiler-rt/test/lit.common.cfg.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -447,7 +447,7 @@ def get_macos_aligned_version(macos_vers):
447447

448448
# These are needed for tests to upload/download temp files, such as
449449
# suppression-files, to device.
450-
config.substitutions.append( ('%device_rundir', "/data/local/tmp/Output") )
450+
config.substitutions.append( ('%device_rundir/', "/data/local/tmp/Output/") )
451451
config.substitutions.append( ('%push_to_device', "%s -s '%s' push " % (adb, env['ANDROID_SERIAL']) ) )
452452
config.substitutions.append( ('%pull_from_device', "%s -s '%s' pull " % (adb, env['ANDROID_SERIAL']) ) )
453453
config.substitutions.append( ('%adb_shell ', "%s -s '%s' shell " % (adb, env['ANDROID_SERIAL']) ) )
@@ -476,7 +476,7 @@ def get_macos_aligned_version(macos_vers):
476476
for file in config.android_files_to_push:
477477
subprocess.check_call([adb, "push", file, android_tmpdir], env=env)
478478
else:
479-
config.substitutions.append( ('%device_rundir', "") )
479+
config.substitutions.append( ('%device_rundir/', "") )
480480
config.substitutions.append( ('%push_to_device', "echo ") )
481481
config.substitutions.append( ('%pull_from_device', "echo ") )
482482
config.substitutions.append( ('%adb_shell', "echo ") )

0 commit comments

Comments
 (0)