commit 10c967f199e7d5518f0beada1c8bd3c0830549f7
author Yang Ni <yangni@google.com> Tue Oct 13 23:07:51 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue Oct 13 23:07:51 2015 +0000
tree 11465c99ac154198f532e2656c9260823e1123bc
parent 7f1edf33d20f541b94b955ad97046f0f0808b618
parent 9a981e8595392fee73cb4060e8e2c169b263ac30

am 9a981e85: Merge "Fix hard coded path to out directory in slang test"

* commit '9a981e8595392fee73cb4060e8e2c169b263ac30':
  Fix hard coded path to out directory in slang test

tests/test.py

diff --git a/tests/test.py b/tests/test.py
index 149651e..3e7dadb 100755
--- a/tests/test.py
+++ b/tests/test.py
@@ -68,11 +68,10 @@
   stdout_file = open('stdout.txt', 'w+')
   stderr_file = open('stderr.txt', 'w+')
 
-  cmd_string = ('../../../../../out/host/linux-x86/bin/llvm-rs-cc '
-                '-o tmp/ -p tmp/ '
-                '-MD '
-                '-I ../../../../../frameworks/rs/scriptc/ '
-                '-I ../../../../../external/clang/lib/Headers/')
+  out_dir = os.environ['ANDROID_HOST_OUT']
+  cmd_string = ("%s/bin/llvm-rs-cc -o tmp/ -p tmp/ -MD "
+                "-I ../../../../../frameworks/rs/scriptc/ "
+                "-I ../../../../../external/clang/lib/Headers/") % out_dir
   base_args = cmd_string.split()
   rs_files = glob.glob('*.rs')
   fs_files = glob.glob('*.fs')