diff options
author | Jean-Marie Henaff <jmhenaff@google.com> | 2014-12-05 11:12:09 +0100 |
---|---|---|
committer | Jean-Marie Henaff <jmhenaff@google.com> | 2014-12-05 11:20:47 +0100 |
commit | 654470a72f18d0b6853c710352ecb0eb12a83610 (patch) | |
tree | 9bc2e54bdd19b4988679d34b0af6556821a69bb4 | |
parent | b316f338210ca17709926c18b7a812919b5a8197 (diff) | |
download | toolchain_jack-654470a72f18d0b6853c710352ecb0eb12a83610.zip toolchain_jack-654470a72f18d0b6853c710352ecb0eb12a83610.tar.gz toolchain_jack-654470a72f18d0b6853c710352ecb0eb12a83610.tar.bz2 |
Move test-exit-status.sh in etc/
Change-Id: Iccf88b7557a62a12717af411d80cc1726204c345
-rwxr-xr-x | jack-tests/etc/test-exit-status.sh (renamed from jack-tests/test-exit-status.sh) | 0 | ||||
-rw-r--r-- | jack-tests/src/com/android/jack/test/runner/DeviceRunner.java | 20 |
2 files changed, 12 insertions, 8 deletions
diff --git a/jack-tests/test-exit-status.sh b/jack-tests/etc/test-exit-status.sh index 14e6a99..14e6a99 100755 --- a/jack-tests/test-exit-status.sh +++ b/jack-tests/etc/test-exit-status.sh diff --git a/jack-tests/src/com/android/jack/test/runner/DeviceRunner.java b/jack-tests/src/com/android/jack/test/runner/DeviceRunner.java index dbb9203..973df5b 100644 --- a/jack-tests/src/com/android/jack/test/runner/DeviceRunner.java +++ b/jack-tests/src/com/android/jack/test/runner/DeviceRunner.java @@ -52,6 +52,10 @@ public abstract class DeviceRunner extends AbstractRuntimeRunner { private static final long ADB_CONNECTION_TIMEOUT = 5000; private static final long ADB_WAIT_STEP = ADB_CONNECTION_TIMEOUT / 10; + private static final String TEST_SCRIPT_NAME = "test-exit-status.sh"; + private static final File TEST_SCRIPT_FILE = + new File(AbstractTestTools.getJackRootDir(), "etc/" + TEST_SCRIPT_NAME); + @Nonnull private MyShellOuputReceiver shellOutput = new MyShellOuputReceiver(); @@ -166,18 +170,18 @@ public abstract class DeviceRunner extends AbstractRuntimeRunner { if (isVerbose) { outRedirectStream.println("adb -s " + device.getSerialNumber() + " push " - + System.getProperty("user.dir") + File.separator + "test-exit-status.sh " - + testsRootDir.getAbsolutePath() + "/test-exit-status.sh"); + + TEST_SCRIPT_FILE.getAbsolutePath() + " " + + testsRootDir.getAbsolutePath() + '/' + TEST_SCRIPT_NAME); } - device.pushFile(System.getProperty("user.dir") + File.separator + "test-exit-status.sh", - testsRootDir.getAbsolutePath() + "/test-exit-status.sh"); + device.pushFile(TEST_SCRIPT_FILE.getAbsolutePath(), + testsRootDir.getAbsolutePath() + '/' + TEST_SCRIPT_NAME); if (isVerbose) { outRedirectStream.println("adb -s " + device.getSerialNumber() + " shell chmod 777 " - + testsRootDir.getAbsolutePath() + "/test-exit-status.sh"); + + testsRootDir.getAbsolutePath() + '/' + TEST_SCRIPT_NAME); } device.executeShellCommand( - "chmod 777 " + testsRootDir.getAbsolutePath() + "/test-exit-status.sh", shellOutput); + "chmod 777 " + testsRootDir.getAbsolutePath() + '/' + TEST_SCRIPT_NAME, shellOutput); int i = 0; for (File f : classpathFiles) { @@ -212,10 +216,10 @@ public abstract class DeviceRunner extends AbstractRuntimeRunner { if (isVerbose) { outRedirectStream.println("adb -s " + device.getSerialNumber() + " shell " - + testsRootDir.getAbsolutePath() + "/test-exit-status.sh " + args); + + testsRootDir.getAbsolutePath() + '/' + TEST_SCRIPT_NAME + ' ' + args); } device.executeShellCommand( - testsRootDir.getAbsolutePath() + "/test-exit-status.sh " + args, + testsRootDir.getAbsolutePath() + '/' + TEST_SCRIPT_NAME + ' ' + args, shellOutput); File exitStatusFile = AbstractTestTools.createTempFile("exitStatus", ""); |