diff options
| author | Eunji Jeong <eun-ji.jeong@samsung.com> | 2015-02-02 17:42:23 +0900 |
|---|---|---|
| committer | Eunji Jeong <eun-ji.jeong@samsung.com> | 2015-02-10 21:53:31 +0900 |
| commit | abd7fd924b6fcf6734d63fd2277f9db472b6a30f (patch) | |
| tree | af47cd3e32ce739d03ac5205e8cf1f992f1630f0 /src/compiletest | |
| parent | fbe78e46eb4a4d7118f96f93b35a3e846f064036 (diff) | |
Add one more depth on android test directory for multiple targets
Diffstat (limited to 'src/compiletest')
| -rw-r--r-- | src/compiletest/compiletest.rs | 4 | ||||
| -rw-r--r-- | src/compiletest/runtest.rs | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/src/compiletest/compiletest.rs b/src/compiletest/compiletest.rs index 1e9f843db34..4e1a3fa1c19 100644 --- a/src/compiletest/compiletest.rs +++ b/src/compiletest/compiletest.rs @@ -156,7 +156,9 @@ pub fn parse_config(args: Vec<String> ) -> Config { lldb_version: extract_lldb_version(matches.opt_str("lldb-version")), android_cross_path: opt_path(matches, "android-cross-path"), adb_path: opt_str2(matches.opt_str("adb-path")), - adb_test_dir: opt_str2(matches.opt_str("adb-test-dir")), + adb_test_dir: format!("{}/{}", + opt_str2(matches.opt_str("adb-test-dir")), + opt_str2(matches.opt_str("target"))), adb_device_status: opt_str2(matches.opt_str("target")).contains("android") && "(none)" != opt_str2(matches.opt_str("adb-test-dir")) && diff --git a/src/compiletest/runtest.rs b/src/compiletest/runtest.rs index 056715e5d1d..43d0fa48900 100644 --- a/src/compiletest/runtest.rs +++ b/src/compiletest/runtest.rs @@ -1509,7 +1509,7 @@ fn _arm_exec_compiled_test(config: &Config, for (key, val) in env { runargs.push(format!("{}={}", key, val)); } - runargs.push(format!("{}/adb_run_wrapper.sh", config.adb_test_dir)); + runargs.push(format!("{}/../adb_run_wrapper.sh", config.adb_test_dir)); runargs.push(format!("{}", config.adb_test_dir)); runargs.push(format!("{}", prog_short)); @@ -1605,7 +1605,7 @@ fn _arm_push_aux_shared_library(config: &Config, testfile: &Path) { file.as_str() .unwrap() .to_string(), - config.adb_test_dir.to_string() + config.adb_test_dir.to_string(), ], vec!(("".to_string(), "".to_string())), |