diff options
Diffstat (limited to 'tools/run_tests/run_tests.py')
| -rwxr-xr-x | tools/run_tests/run_tests.py | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/tools/run_tests/run_tests.py b/tools/run_tests/run_tests.py index 00dd4ca605..0b4f26ca44 100755 --- a/tools/run_tests/run_tests.py +++ b/tools/run_tests/run_tests.py @@ -614,7 +614,10 @@ class PythonLanguage(object): return [config.build for config in self.pythons] def post_tests_steps(self): - return [] + if self.config != 'gcov': + return [] + else: + return [['tools/run_tests/helper_scripts/post_tests_python.sh']] def makefile_name(self): return 'Makefile' @@ -1270,7 +1273,9 @@ if any(language.make_options() for language in languages): print('languages with custom make options cannot be built simultaneously with other languages') sys.exit(1) else: - language_make_options = next(iter(languages)).make_options() + # Combining make options is not clean and just happens to work. It allows C/C++ and C# to build + # together, and is only used under gcov. All other configs should build languages individually. + language_make_options = list(set([make_option for lang in languages for make_option in lang.make_options()])) if args.use_docker: if not args.travis: |