diff options
| author | David Majnemer <david.majnemer@gmail.com> | 2014-11-04 05:54:50 +0000 |
|---|---|---|
| committer | David Majnemer <david.majnemer@gmail.com> | 2014-11-04 05:54:50 +0000 |
| commit | 83d6857b72d6edb473907970237b14843485b26a (patch) | |
| tree | e239a331cdb1f9ffe510c56298b91922a07c84af | |
| parent | 8030ffda9156f6ac290035bcf692823763d77a8f (diff) | |
| download | bcm5719-llvm-83d6857b72d6edb473907970237b14843485b26a.tar.gz bcm5719-llvm-83d6857b72d6edb473907970237b14843485b26a.zip | |
test: Restore llvm-lit (at least for my machine)
r221137 feeds None into os.path.join which is not valid.
llvm-svn: 221242
| -rw-r--r-- | llvm/test/lit.cfg | 35 |
1 files changed, 19 insertions, 16 deletions
diff --git a/llvm/test/lit.cfg b/llvm/test/lit.cfg index 40b5a25c497..40ee8dd7299 100644 --- a/llvm/test/lit.cfg +++ b/llvm/test/lit.cfg @@ -97,22 +97,25 @@ for symbolizer in ['ASAN_SYMBOLIZER_PATH', 'MSAN_SYMBOLIZER_PATH']: # Set up OCAMLPATH to include newly built OCaml libraries. llvm_lib_dir = getattr(config, 'llvm_lib_dir', None) -if not llvm_lib_dir: - llvm_lib_dir = os.path.join(getattr(config, 'llvm_obj_root', None), 'lib') - -llvm_ocaml_lib = os.path.join(llvm_lib_dir, 'ocaml') -if 'OCAMLPATH' in os.environ: - ocamlpath = os.path.pathsep.join((llvm_ocaml_lib, os.environ['OCAMLPATH'])) - config.environment['OCAMLPATH'] = ocamlpath -else: - config.environment['OCAMLPATH'] = llvm_ocaml_lib - -if 'CAML_LD_LIBRARY_PATH' in os.environ: - caml_ld_library_path = os.path.pathsep.join((llvm_ocaml_lib, - os.environ['CAML_LD_LIBRARY_PATH'])) - config.environment['CAML_LD_LIBRARY_PATH'] = caml_ld_library_path -else: - config.environment['CAML_LD_LIBRARY_PATH'] = llvm_ocaml_lib +if llvm_lib_dir is None: + if llvm_obj_root is not None: + llvm_lib_dir = os.path.join(llvm_obj_root, 'lib') + +if llvm_lib_dir is not None: + llvm_ocaml_lib = os.path.join(llvm_lib_dir, 'ocaml') + if llvm_ocaml_lib is not None: + if 'OCAMLPATH' in os.environ: + ocamlpath = os.path.pathsep.join((llvm_ocaml_lib, os.environ['OCAMLPATH'])) + config.environment['OCAMLPATH'] = ocamlpath + else: + config.environment['OCAMLPATH'] = llvm_ocaml_lib + + if 'CAML_LD_LIBRARY_PATH' in os.environ: + caml_ld_library_path = os.path.pathsep.join((llvm_ocaml_lib, + os.environ['CAML_LD_LIBRARY_PATH'])) + config.environment['CAML_LD_LIBRARY_PATH'] = caml_ld_library_path + else: + config.environment['CAML_LD_LIBRARY_PATH'] = llvm_ocaml_lib # Set up OCAMLRUNPARAM to enable backtraces in OCaml tests. config.environment['OCAMLRUNPARAM'] = 'b' |
