From 2d656d6285e5db5c2a23c0144b5b97e637e61a6c Mon Sep 17 00:00:00 2001 From: Brian Anderson Date: Sat, 18 Jan 2014 18:23:46 -0800 Subject: [PATCH] Pass the correct --target flag when type checking pretty-printed code in tests This makes pretty print tests that have aux crates work correctly on Android. Without they generate errors ICEs about incorrect node ids. Not sure why. --- src/compiletest/runtest.rs | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/compiletest/runtest.rs b/src/compiletest/runtest.rs index 6b822fedda62..9ebc8236f6fe 100644 --- a/src/compiletest/runtest.rs +++ b/src/compiletest/runtest.rs @@ -237,9 +237,15 @@ fn typecheck_source(config: &config, props: &TestProps, fn make_typecheck_args(config: &config, props: &TestProps, testfile: &Path) -> ProcArgs { let aux_dir = aux_output_dir_name(config, testfile); + let target = if props.force_host { + config.host.as_slice() + } else { + config.target.as_slice() + }; // FIXME (#9639): This needs to handle non-utf8 paths let mut args = ~[~"-", ~"--no-trans", ~"--lib", + ~"--target=" + target, ~"-L", config.build_base.as_str().unwrap().to_owned(), ~"-L", aux_dir.as_str().unwrap().to_owned()];