[PATCH] D17403: Fix the use of -j in make test

[Krzysztof Parzyszek via llvm-commits]

kparzysz created this revision.
kparzysz added reviewers: gkistanova, dsanders.
kparzysz added a subscriber: llvm-commits.
kparzysz set the repository for this revision to rL LLVM.
kparzysz added a project: Zorg.
Herald added a reviewer: vkalintiris.

getLLVMCMakeBuildFactory constructs the -jN option incorrectly when running "make check-all".

Example:
http://lab.llvm.org:8011/builders/llvm-hexagon-elf/builds/26076/steps/test-llvm/logs/stdio


```
make check-all VERBOSE=1 'LIT_ARGS=-v -j 16'
 in dir /var/lib/buildbot/slaves/hexagon-build-03/llvm-hexagon-elf/llvm.obj (timeout 1200 secs)
 watching logfiles {}
 argv: ['make', 'check-all', 'VERBOSE=1', 'LIT_ARGS=-v -j 16']
```

Specifically, the -jN option is a part of LIT_ARGS, not the make invocation.

Repository:
  rL LLVM

http://reviews.llvm.org/D17403

Files:
  zorg/buildbot/builders/LLVMBuilder.py

Index: zorg/buildbot/builders/LLVMBuilder.py
===================================================================
--- zorg/buildbot/builders/LLVMBuilder.py
+++ zorg/buildbot/builders/LLVMBuilder.py
@@ -212,12 +212,10 @@
             env             = merged_env,
             timeout         = timeout * 60))
     if test:
-        litTestArgs = '-v -j %s' % jobs
         f.addStep(
             LitTestCommand(
                 name            = 'test-llvm',
-                command         = [make, "check-all", "VERBOSE=1",
-                                   WithProperties("LIT_ARGS=%s" % litTestArgs)],
+                command         = [make, "check-all", "VERBOSE=1", "-j" % jobs],
                 description     = ["testing", "llvm"],
                 descriptionDone = ["test",    "llvm"],
                 workdir         = llvm_objdir,


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D17403.48370.patch
Type: text/x-patch
Size: 852 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20160218/6e3a7eac/attachment.bin>