[llvm] r221242 - test: Restore llvm-lit (at least for my machine)

[Jiangning Liu]

David,

Thanks a lot! Confirmed that the lit.cfg problem is fixed.

-Jiangning

2014-11-04 13:54 GMT+08:00 David Majnemer <david.majnemer at gmail.com>:

> Author: majnemer
> Date: Mon Nov  3 23:54:50 2014
> New Revision: 221242
>
> URL: http://llvm.org/viewvc/llvm-project?rev=221242&view=rev
> Log:
> test: Restore llvm-lit (at least for my machine)
>
> r221137 feeds None into os.path.join which is not valid.
>
> Modified:
>     llvm/trunk/test/lit.cfg
>
> Modified: llvm/trunk/test/lit.cfg
> URL:
> http://llvm.org/viewvc/llvm-project/llvm/trunk/test/lit.cfg?rev=221242&r1=221241&r2=221242&view=diff
>
> ==============================================================================
> --- llvm/trunk/test/lit.cfg (original)
> +++ llvm/trunk/test/lit.cfg Mon Nov  3 23:54:50 2014
> @@ -97,22 +97,25 @@ for symbolizer in ['ASAN_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')
> +if llvm_lib_dir is None:
> +    if llvm_obj_root is not None:
> +        llvm_lib_dir = os.path.join(llvm_obj_root, '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 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
> +        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'
>
>
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20141104/c31bfd6c/attachment.html>