diff --git a/compiler-rt/test/lit.common.cfg.py b/compiler-rt/test/lit.common.cfg.py index 1f6b0b5479d18..4e80e20eb3307 100644 --- a/compiler-rt/test/lit.common.cfg.py +++ b/compiler-rt/test/lit.common.cfg.py @@ -449,7 +449,6 @@ def get_macos_aligned_version(macos_vers): # suppression-files, to device. 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']) ) ) config.substitutions.append( ('%device_rm', "%s -s '%s' shell 'rm ' " % (adb, env['ANDROID_SERIAL']) ) ) @@ -478,7 +477,6 @@ def get_macos_aligned_version(macos_vers): else: 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 ") ) if config.host_os == 'Linux': diff --git a/compiler-rt/test/lsan/TestCases/Linux/log-path_test.cpp b/compiler-rt/test/lsan/TestCases/Linux/log-path_test.cpp index aba3aa12411ce..e2f59ea693c47 100644 --- a/compiler-rt/test/lsan/TestCases/Linux/log-path_test.cpp +++ b/compiler-rt/test/lsan/TestCases/Linux/log-path_test.cpp @@ -6,12 +6,12 @@ // RUN: FileCheck %s --check-prefix=CHECK-ERROR < %t.out // Good log_path. -// RUN: rm -f %t.log.* +// RUN: rm -f %t.log.* %t.log // RUN: %adb_shell 'rm -f %t.log.*' // RUN: %env_lsan_opts="use_stacks=0:log_path='"%device_rundir/%t.log"'" not %run %t > %t.out 2>&1 // adb-pull doesn't support wild cards so we need to rename the log file. -// RUN: %adb_shell 'mv %device_rundir/%t.log.* %device_rundir/%t.log' -// RUN: %pull_from_device %device_rundir/%t.log %t.log.ANDROID +// RUN: cat %device_rundir/%t.log.* >> %t.log +// RUN: %adb_shell 'cat %device_rundir/%t.log.*' >> %t.log // RUN: FileCheck %s --check-prefix=CHECK-ERROR < %t.log.* #include