Build and test project depends on project enabled in LibcxxAndAbiBuilder

[Xiangling_L]

Summary

1.Build and test project depends on project enabled in LibcxxAndAbiBuilder
2.pass env to all steps

[Xiangling_L]

ping.

[Xiangling_L]

ping.

[ZarkoCA]

zorg/buildbot/builders/LibcxxAndAbiBuilder.py

96–100

It looks like libcxxabi and libcxx are hard coded to be in depends_on_projects in line 28. Can something else remove them from the list?

It's not clear to me why we check whether they are in the list if they are hard coded.

[Xiangling_L]

zorg/buildbot/builders/LibcxxAndAbiBuilder.py

96–100

In line 13, we can see it's possible for us to pass in customized depends_on_projects. So it's not always equal to default values.

[ZarkoCA]

zorg/buildbot/builders/LibcxxAndAbiBuilder.py

96–100

Ah, thanks. I missed that those are only set if it's value of depends_on_projects is None

[gkistanova]

This patch introduced a bug.

A quick fix in in https://github.com/llvm/llvm-zorg/commit/9710f7832a344854c51248164a0a4c55f2b6c1d1.

zorg/buildbot/builders/LibcxxAndAbiBuilder.py

105

jobs_flag here and in the similar places below could be referenced without being assigned a value above, depending on the exact list of projects in the depends_on_projects.

[Xiangling_L]

zorg/buildbot/builders/LibcxxAndAbiBuilder.py

105

I see. Thank you for providing a fix for this.

zorg/buildbot/builders/LibcxxAndAbiBuilder.py

else:
         ('-DLLVM_ENABLE_PROJECTS=', ";".join(f.depends_on_projects)),
         ])
 
     f.addStep(buildbot.steps.shell.ShellCommand(
         name='cmake', command=['cmake', rel_src_dir] + cmake_opts,
         haltOnFailure=True, workdir=build_path, env=env))
 
     # Build libcxxabi
+    if 'libcxxabi' in depends_on_projects:
         jobs_flag = properties.WithProperties('-j%(jobs)s')
         f.addStep(buildbot.steps.shell.ShellCommand(
-              name='build.libcxxabi', command=['make', jobs_flag, 'cxxabi'],
-              haltOnFailure=True, workdir=build_path))
+            haltOnFailure=True, workdir=build_path, env=env))
 
     # Build libcxx
+    if 'libcxx' in depends_on_projects:
         f.addStep(buildbot.steps.shell.ShellCommand(
-              name='build.libcxx', command=['make', jobs_flag, 'cxx'],
-              haltOnFailure=True, workdir=build_path))
+            haltOnFailure=True, workdir=build_path, env=env))
 
     # Test libc++abi
+    if 'libcxxabi' in depends_on_projects:
         f.addStep(LitTestCommand(
             name            = 'test.libcxxabi',
             command         = ['make', jobs_flag, 'check-cxxabi'],
             description     = ['testing', 'libcxxabi'],
             descriptionDone = ['test', 'libcxxabi'],
-        workdir         = build_path))
+            workdir         = build_path,
+            env             = env))
 
     # Test libc++
+    if 'libcxx' in depends_on_projects:
         f.addStep(LitTestCommand(
             name            = 'test.libcxx',
             command         = ['make', jobs_flag, 'check-cxx'],
             description     = ['testing', 'libcxx'],
             descriptionDone = ['test', 'libcxx'],
-        workdir         = build_path))
+            workdir         = build_path,
+            env             = env))
 
     if check_libcxx_abilist:
         f.addStep(buildbot.steps.shell.ShellCommand(
         name            = 'test.libcxx.abilist',
         command         = ['make', 'check-cxx-abilist'],
         description     = ['testing', 'libcxx', 'abi'],
         descriptionDone = ['test', 'libcxx', 'abi'],
-        workdir         = build_path))
+        workdir         = build_path,
+        env             = env))
 
     if check_libcxx_benchmarks:
       # Build the libc++ benchmarks
       f.addStep(buildbot.steps.shell.ShellCommand(
           name='build.libcxx.benchmarks',
           command=['make', jobs_flag, 'cxx-benchmarks'],
-          haltOnFailure=True, workdir=build_path))
+          haltOnFailure=True, workdir=build_path, env=env))
 
       # Run the benchmarks
       f.addStep(LitTestCommand(
           name            = 'test.libcxx.benchmarks',
           command         = ['make', jobs_flag, 'check-cxx-benchmarks'],
           description     = ['testing', 'libcxx', 'benchmarks'],
           descriptionDone = ['test', 'libcxx', 'benchmarks'],
-          workdir         = build_path))
+          workdir         = build_path,
+          env             = env))
 
     return f