[llvm-commits] [zorg] r171168 - /zorg/trunk/zorg/buildbot/builders/ClangBuilder.py

[NAKAMURA Takumi]

David, $TESTARGS, "clangTestArgs" in this context, is not used in
llvm/test, check-all.

...Takumi

2012/12/28 David Blaikie <dblaikie at gmail.com>:
> Author: dblaikie
> Date: Thu Dec 27 14:44:19 2012
> New Revision: 171168
>
> URL: http://llvm.org/viewvc/llvm-project?rev=171168&view=rev
> Log:
> Re-enable Valgrind execution that I accidentally regressed in r163020.
>
> Pointed out by Takumi in review.
>
> Honestly I'm not sure what's going on here & my change (163020 combined with
> this fix) will still differ from the previous valgrind buildbot behavior. It
> looks like, previously, valgrind was only used for clang tests. Now it will be
> used for all the tests when it is enabled, I think. We could simplify this by
> not creating a separate variable for the 'clangTestArgs' and the 'llvmTestArgs'
> if this is the right behavior anyway.
>
> The phased builder might change this - since we'll be building LLVM once,
> separately, then we'll just be building/testing clang separately again.
>
> Perhaps the right solution is to revert both of these changes & simply make
> "check-clang" also run the clang-tools-extra tests if they are present.
>
> Modified:
>     zorg/trunk/zorg/buildbot/builders/ClangBuilder.py
>
> Modified: zorg/trunk/zorg/buildbot/builders/ClangBuilder.py
> URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/buildbot/builders/ClangBuilder.py?rev=171168&r1=171167&r2=171168&view=diff
> ==============================================================================
> --- zorg/trunk/zorg/buildbot/builders/ClangBuilder.py (original)
> +++ zorg/trunk/zorg/buildbot/builders/ClangBuilder.py Thu Dec 27 14:44:19 2012
> @@ -213,7 +213,9 @@
>      if test:
>          f.addStep(ClangTestCommand(name='check-all',
>                                     command=[make, "check-all", "VERBOSE=1",
> -                                            WithProperties("LIT_ARGS=%s" % llvmTestArgs)],
> +                                            WithProperties("LIT_ARGS=%s" % llvmTestArgs),
> +                                            WithProperties("TESTARGS=%s" % clangTestArgs),
> +                                            WithProperties("EXTRA_TESTDIRS=%s" % extraTestDirs)],
>                                     description=["checking"],
>                                     descriptionDone=["checked"],
>                                     workdir=llvm_1_objdir,
> @@ -314,7 +316,9 @@
>      if test:
>          f.addStep(ClangTestCommand(name='check-all',
>                                     command=[make, "check-all", "VERBOSE=1",
> -                                            WithProperties("LIT_ARGS=%s" % llvmTestArgs)],
> +                                            WithProperties("LIT_ARGS=%s" % llvmTestArgs),
> +                                            WithProperties("TESTARGS=%s" % clangTestArgs),
> +                                            WithProperties("EXTRA_TESTDIRS=%s" % extraTestDirs)],
>                                     description=["checking"],
>                                     descriptionDone=["checked"],
>                                     workdir=llvm_2_objdir,
>
>
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits