Swiftdiff options
| author | Tobias Markmann <tm@ayena.de> | 2013-08-14 15:03:35 (GMT) |
|---|---|---|
| committer | Tobias Markmann <tm@ayena.de> | 2013-08-14 15:33:23 (GMT) |
| commit | 096aab8e39493803e14f50dc6d1f4440a9e9c55d (patch) | |
| tree | 558114a62405dfbcaf6f41e7f9b209701634243a | |
| parent | 071974c26d34bdf92c1162eed0f4ee17651c5bea (diff) | |
| download | swift-096aab8e39493803e14f50dc6d1f4440a9e9c55d.zip swift-096aab8e39493803e14f50dc6d1f4440a9e9c55d.tar.bz2 | |
Adjust Android test deployment path.
Change-Id: I3791b31beb7a968901b33722a18771185e7aa61e
License: This patch is BSD-licensed, see Documentation/Licenses/BSD-simplified.txt for details.
| -rw-r--r-- | BuildTools/SCons/Tools/Test.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/BuildTools/SCons/Tools/Test.py b/BuildTools/SCons/Tools/Test.py index ee16ec4..95fcce9 100644 --- a/BuildTools/SCons/Tools/Test.py +++ b/BuildTools/SCons/Tools/Test.py @@ -33,8 +33,8 @@ def generate(env) : exec_name = os.path.basename(cmd) test_env.Command("**dummy**", target, SCons.Action.Action( ["adb shell mount -o rw,remount /system", - "adb push " + cmd + " /system/usr/bin/" + exec_name, - "adb shell SWIFT_CLIENTTEST_JID=\"" + os.getenv("SWIFT_CLIENTTEST_JID") + "\" SWIFT_CLIENTTEST_PASS=\"" + os.getenv("SWIFT_CLIENTTEST_PASS") + "\" " + env.get("TEST_RUNNER", "") + "/system/usr/bin/" + exec_name], cmdstr = "$TESTCOMSTR")) + "adb push " + cmd + " /system/bin/" + exec_name, + "adb shell SWIFT_CLIENTTEST_JID=\"" + os.getenv("SWIFT_CLIENTTEST_JID") + "\" SWIFT_CLIENTTEST_PASS=\"" + os.getenv("SWIFT_CLIENTTEST_PASS") + "\" " + env.get("TEST_RUNNER", "") + "/system/bin/" + exec_name], cmdstr = "$TESTCOMSTR")) else : test_env.Command("**dummy**", target, SCons.Action.Action(ignore_prefix + env.get("TEST_RUNNER", "") + cmd + " " + params, cmdstr = "$TESTCOMSTR")) |