This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, next has been updated
via d954016868c66aa78b66bd94c2d744b8cc42738a (commit)
via 513ef514e51702bf7775f79119f8e3e39ccbb784 (commit)
from 14f8a662df08f79471f199ff40444593933e509d (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d954016868c66aa78b66bd94c2d744b8cc42738a
commit d954016868c66aa78b66bd94c2d744b8cc42738a
Merge: 14f8a66 513ef51
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Tue Jan 10 13:14:22 2017 -0500
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Tue Jan 10 13:14:22 2017 -0500
Merge topic 'AndroidTestUtilities-fix-cleanup' into next
513ef514 AndroidTestUtilities: fix cleanup operation
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=513ef514e51702bf7775f79119f8e3e39ccbb784
commit 513ef514e51702bf7775f79119f8e3e39ccbb784
Author: Ruslan Baratov <ruslan_bara...@yahoo.com>
AuthorDate: Tue Dec 27 21:15:36 2016 +0800
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Tue Jan 10 13:12:45 2017 -0500
AndroidTestUtilities: fix cleanup operation
`su` is not available by default on all devices:
```
> adb shell "echo ls /data/local/tmp | su"
/system/bin/sh: su: not found
> echo $?
0
```
Also since `execute_adb_command` use `execute_process` under the hood
the pipeline (`|`) will not be treated as special symbol and will be
process just like one more command line argument for the `adb`.
diff --git a/Modules/AndroidTestUtilities/PushToAndroidDevice.cmake
b/Modules/AndroidTestUtilities/PushToAndroidDevice.cmake
index f5f2564..d8ca730 100644
--- a/Modules/AndroidTestUtilities/PushToAndroidDevice.cmake
+++ b/Modules/AndroidTestUtilities/PushToAndroidDevice.cmake
@@ -117,7 +117,7 @@ function(android_push_test_files_to_device)
check_device_file_exists(${_ptd_DEV_TEST_DIR} test_dir_exists)
if(test_dir_exists)
# This is protected in the SetupProjectTests module.
- execute_adb_command(shell echo rm -r ${_ptd_DEV_TEST_DIR} | su)
+ execute_adb_command(shell rm -r ${_ptd_DEV_TEST_DIR})
endif()
execute_adb_command(shell mkdir -p ${_ptd_DEV_TEST_DIR})
-----------------------------------------------------------------------
Summary of changes:
Modules/AndroidTestUtilities/PushToAndroidDevice.cmake | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
