[zorg]Support separate toolchain locations for android build and test

[chying]

Summary

-toolchain_build will be used to build lldb-server
-toolchain_test will be used to build test inferiors, toolchain level for test should be the same with device api level

[ovyalov]

LGTM

zorg/buildbot/builders/LLDBBuilder.py

268 ↗

(On Diff #29971)

nit, up to you - os.path.join('%(toolchain_test)s', 'bin', compiler)

zorg/trunk/zorg/buildbot/builders/LLDBBuilder.py

def getLLDBTestSteps(f,
     # TODO: for now, run tests with 8 threads and without mi tests on android
     # come back when those issues are addressed
     testenv=dict(env)
     for compiler in test_compilers:
         # find full path for top of tree clang
         if compiler=='totclang':
             compilerPath=bindir + '/clang'
         elif remote_platform is 'android':
-            compilerPath = '%(toolchain)s' + '/bin/' + compiler
+            compilerPath = os.path.join('%(toolchain_test)s', 'bin', compiler)
         else:
             compilerPath = compiler
         for arch in test_archs:
             DOTEST_OPTS=''.join(['--executable ' + bindir + '/lldb ',
                                  '-A %s ' % arch,
                                  '-C %s ' % compilerPath,
                                  '-s lldb-test-traces-%s-%s ' % (compiler, arch),
                                  '-u CXXFLAGS ',
def getLLDBRemoteTestSteps(f,
     # get configuration of remote target
     # config file should be placed under builddir on builder machine
     # file name: remote_cfg.json
     # content: json format with keys [remote_platform]-[remote_arch]
     # the value for each key defines "remote_host", "remote_port", "remote_dir", "toolchain", "deviceId"
     # example: {"android-i386": {"remote_host":"localhost",
     #                            "remote_port":"5430",
     #                            "remote_dir":"/data/local/tmp/lldb",
-    #                            "toolchain":"/home/lldb_build/Toolchains/i386-android-toolchain",
+    #                            "toolchain_build":"/home/lldb_build/Toolchains/i386-android-toolchain-21",
+    #                            "toolchain_test":"/home/lldb_build/Toolchains/i386-android-toolchain-16",
     #                            "deviceid":"XXXXXXX"},
 
     def getRemoteCfg(rc, stdout, stderr):
         return json.loads(stdout)[stepDesc]
     f.addStep(SetProperty(name="get remote target " + stepDesc,
                           command="cat remote_cfg.json",
                           extract_fn=getRemoteCfg,
                           description="get remote target",
abiMap={
             'arm':'armeabi',
             'aarch64':'aarch64'
            }
     # Construct cmake
     cmake_args = ["cmake", "-GNinja"]
     cmake_args.append(WithProperties("-DCMAKE_BUILD_TYPE=%s" % build_type))
     cmake_args.append(WithProperties('%(builddir)s/' + llvm_srcdir))
     cmake_args.append(WithProperties('-DCMAKE_TOOLCHAIN_FILE=' + '%(builddir)s/' + llvm_srcdir + '/tools/lldb/cmake/platforms/Android.cmake'))
-    cmake_args.append(WithProperties('-DANDROID_TOOLCHAIN_DIR=' + '%(toolchain)s'))
+    cmake_args.append(WithProperties('-DANDROID_TOOLCHAIN_DIR=' + '%(toolchain_build)s'))
     cmake_args.append('-DANDROID_ABI=' + abiMap[target_arch])
     cmake_args.append('-DCMAKE_CXX_COMPILER_VERSION=4.9')
     cmake_args.append('-DLLVM_TARGET_ARCH=' + target_arch)
     cmake_args.append('-DLLVM_HOST_TRIPLE=' + target_arch + '-unknown-linux-android')
     cmake_args.append(WithProperties('-DLLVM_TABLEGEN=%(tblgen_bindir)s/llvm-tblgen'))
     cmake_args.append(WithProperties('-DCLANG_TABLEGEN=%(tblgen_bindir)s/clang-tblgen'))
 
     f.addStep(Configure(name='cmake-android-%s' % target_arch,