Author: timshen Date: Mon Oct 23 20:11:02 2017 New Revision: 316411 URL: http://llvm.org/viewvc/llvm-project?rev=316411&view=rev Log: [test] Fix clang-test for FreeBSD and NetBSD
Lit tries to inject the shared library paths, but no action is taken when platform.system() is not recognized, results in an environment variable with an empty name, which is illegal. The patch fixes this mechanism for FreeBSD and NetBSD, and gives an warning on other platforms, so that the latecomers don't have to spend time on debugging lit. Thanks Zhihao Yuan for the patch! Differential Revision: https://reviews.llvm.org/D39162 Modified: cfe/trunk/test/Unit/lit.cfg.py Modified: cfe/trunk/test/Unit/lit.cfg.py URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Unit/lit.cfg.py?rev=316411&r1=316410&r2=316411&view=diff ============================================================================== --- cfe/trunk/test/Unit/lit.cfg.py (original) +++ cfe/trunk/test/Unit/lit.cfg.py Mon Oct 23 20:11:02 2017 @@ -35,17 +35,23 @@ for symbolizer in ['ASAN_SYMBOLIZER_PATH if symbolizer in os.environ: config.environment[symbolizer] = os.environ[symbolizer] -shlibpath_var = '' -if platform.system() == 'Linux': - shlibpath_var = 'LD_LIBRARY_PATH' -elif platform.system() == 'Darwin': - shlibpath_var = 'DYLD_LIBRARY_PATH' -elif platform.system() == 'Windows': - shlibpath_var = 'PATH' +def find_shlibpath_var(): + if platform.system() in ['Linux', 'FreeBSD', 'NetBSD']: + yield 'LD_LIBRARY_PATH' + elif platform.system() == 'Darwin': + yield 'DYLD_LIBRARY_PATH' + elif platform.system() == 'Windows': + yield 'PATH' -# in stand-alone builds, shlibdir is clang's build tree -# while llvm_libs_dir is installed LLVM (and possibly older clang) -shlibpath = os.path.pathsep.join((config.shlibdir, config.llvm_libs_dir, - config.environment.get(shlibpath_var,''))) - -config.environment[shlibpath_var] = shlibpath +for shlibpath_var in find_shlibpath_var(): + # in stand-alone builds, shlibdir is clang's build tree + # while llvm_libs_dir is installed LLVM (and possibly older clang) + shlibpath = os.path.pathsep.join( + (config.shlibdir, + config.llvm_libs_dir, + config.environment.get(shlibpath_var, ''))) + config.environment[shlibpath_var] = shlibpath + break +else: + lit_config.warning("unable to inject shared library path on '{}'" + .format(platform.system())) _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits