[compiler-rt] 7f7fb2e - [compiler-rt] Fix %device_rundir test substitution

[Vitaly Buka via llvm-commits]

Author: Vitaly Buka
Date: 2021-07-20T17:39:22-07:00
New Revision: 7f7fb2ef5da356cb7c8ff720b703d028c94fedd0

URL: https://github.com/llvm/llvm-project/commit/7f7fb2ef5da356cb7c8ff720b703d028c94fedd0
DIFF: https://github.com/llvm/llvm-project/commit/7f7fb2ef5da356cb7c8ff720b703d028c94fedd0.diff

LOG: [compiler-rt] Fix %device_rundir test substitution

"/" needs to be removed to avoid making absolute path.

Added: 
    

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

Removed: 
    


################################################################################
diff  --git a/compiler-rt/test/lit.common.cfg.py b/compiler-rt/test/lit.common.cfg.py
index 75dc77e221733..1f6b0b5479d18 100644
--- a/compiler-rt/test/lit.common.cfg.py
+++ b/compiler-rt/test/lit.common.cfg.py
@@ -447,7 +447,7 @@ def get_macos_aligned_version(macos_vers):
 
   # 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 @@ def get_macos_aligned_version(macos_vers):
   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 ") )