@@ -551,7 +551,7 @@ fn exec_compiled_test(config: &config, props: &TestProps,
551
551
552
552
~"arm-linux-androideabi" => {
553
553
if ( config. adb_device_status ) {
554
- _arm_exec_compiled_test ( config, props, testfile)
554
+ _arm_exec_compiled_test ( config, props, testfile, env )
555
555
} else {
556
556
_dummy_exec_compiled_test ( config, props, testfile)
557
557
}
@@ -777,7 +777,7 @@ stderr:\n\
777
777
}
778
778
779
779
fn _arm_exec_compiled_test ( config : & config , props : & TestProps ,
780
- testfile : & Path ) -> ProcRes {
780
+ testfile : & Path , env : ~ [ ( ~ str , ~ str ) ] ) -> ProcRes {
781
781
782
782
let args = make_run_args ( config, props, testfile) ;
783
783
let cmdline = make_cmdline ( "" , args. prog , args. args ) ;
@@ -803,6 +803,9 @@ fn _arm_exec_compiled_test(config: &config, props: &TestProps,
803
803
804
804
// run test via adb_run_wrapper
805
805
runargs. push ( ~"shell") ;
806
+ for ( key, val) in env. move_iter ( ) {
807
+ runargs. push ( fmt ! ( "%s=%s" , key, val) ) ;
808
+ }
806
809
runargs. push ( fmt ! ( "%s/adb_run_wrapper.sh" , config. adb_test_dir) ) ;
807
810
runargs. push ( fmt ! ( "%s" , config. adb_test_dir) ) ;
808
811
runargs. push ( fmt ! ( "%s" , prog_short) ) ;
0 commit comments