diff options
author | 2016-07-01 14:17:38 -0700 | |
---|---|---|
committer | 2016-07-01 14:17:38 -0700 | |
commit | 3c945ee2b3c3bf0fd01cc995332e252d1e10e51e (patch) | |
tree | 9bbd2d09cebc94133609932827b8fa7a71bb8365 /tools/run_tests/package_targets.py | |
parent | afa864244d921626480abc6e4408a2aa183396c3 (diff) | |
parent | 20caeb182cbc152e7e038306a9b01f438f79ca41 (diff) |
Merge branch 'master' into filter_call_init_failure
Diffstat (limited to 'tools/run_tests/package_targets.py')
-rw-r--r-- | tools/run_tests/package_targets.py | 26 |
1 files changed, 19 insertions, 7 deletions
diff --git a/tools/run_tests/package_targets.py b/tools/run_tests/package_targets.py index 820b539b59..39a11a243d 100644 --- a/tools/run_tests/package_targets.py +++ b/tools/run_tests/package_targets.py @@ -71,18 +71,29 @@ def create_jobspec(name, cmdline, environ=None, cwd=None, shell=False, class CSharpPackage: """Builds C# nuget packages.""" - def __init__(self): - self.name = 'csharp_package' - self.labels = ['package', 'csharp', 'windows'] + def __init__(self, use_coreclr=False): + self.use_coreclr = use_coreclr + self.name = 'csharp_package_coreclr' if use_coreclr else 'csharp_package' + self.labels = ['package', 'csharp'] + if use_coreclr: + self.labels += ['linux'] + else: + self.labels += ['windows'] def pre_build_jobspecs(self): return [] def build_jobspec(self): - return create_jobspec(self.name, - ['build_packages.bat'], - cwd='src\\csharp', - shell=True) + if self.use_coreclr: + return create_docker_jobspec( + self.name, + 'tools/dockerfile/test/csharp_coreclr_x64', + 'tools/run_tests/build_package_csharp_coreclr.sh') + else: + return create_jobspec(self.name, + ['build_packages.bat'], + cwd='src\\csharp', + shell=True) def __str__(self): return self.name @@ -159,6 +170,7 @@ class PHPPackage: def targets(): """Gets list of supported targets""" return [CSharpPackage(), + CSharpPackage(use_coreclr=True), NodePackage(), RubyPackage(), PythonPackage(), |