Changeset View
Changeset View
Standalone View
Standalone View
contrib/teamcity/build-configurations.py
| Show First 20 Lines • Show All 181 Lines • ▼ Show 20 Lines | def create_build_steps(self, artifact_dir): | ||||
| "-DCMAKE_C_FLAGS=-Werror", | "-DCMAKE_C_FLAGS=-Werror", | ||||
| "-DCMAKE_CXX_FLAGS=-Werror", | "-DCMAKE_CXX_FLAGS=-Werror", | ||||
| ]) | ]) | ||||
| # Get the generator, default to ninja | # Get the generator, default to ninja | ||||
| generator = self.config.get("generator", {}) | generator = self.config.get("generator", {}) | ||||
| generator_name = generator.get("name", "Ninja") | generator_name = generator.get("name", "Ninja") | ||||
| generator_command = generator.get("command", "ninja") | generator_command = generator.get("command", "ninja") | ||||
| generator_flags = generator.get("flags", ["-k0"]) | generator_flags = generator.get( | ||||
| "flags", ["-k0"] if not self.config.get("fail_fast", False) else []) | |||||
deadalnix: Well that's your problem. You want this on test suite running on master, but not on the one… | |||||
| # Max out the jobs by default when the generator uses make | # Max out the jobs by default when the generator uses make | ||||
| if generator_command == "make": | if generator_command == "make": | ||||
| generator_flags.append("-j{}".format(self.jobs)) | generator_flags.append("-j{}".format(self.jobs)) | ||||
| # Handle cross build configuration | # Handle cross build configuration | ||||
| cross_build = self.config.get("cross_build", None) | cross_build = self.config.get("cross_build", None) | ||||
| if cross_build: | if cross_build: | ||||
| ▲ Show 20 Lines • Show All 372 Lines • Show Last 20 Lines | |||||
Well that's your problem. You want this on test suite running on master, but not on the one running on each diff.
You can solve this whole thing durably by using sensible defaults.