Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion utils/build_swift/driver_arguments.py
Original file line number Diff line number Diff line change
Expand Up @@ -1046,7 +1046,6 @@ def create_argument_parser():
option('--install-swift', toggle_true('impl_install_swift'))
option('--skip-test-swift', toggle_true('impl_skip_test_swift'))


# -------------------------------------------------------------------------
return builder.build()

Expand Down
2 changes: 1 addition & 1 deletion utils/build_swift/tests/test_driver_arguments.py
Original file line number Diff line number Diff line change
Expand Up @@ -421,7 +421,7 @@ def parse_args_and_unknown_args(self, args, namespace=None):

def parse_args(self, args, namespace=None):
namespace, unknown_args = self.parse_args_and_unknown_args(args,
namespace)
namespace)

if unknown_args:
raise ParserError('unknown arguments: ' + str(unknown_args))
Expand Down
5 changes: 3 additions & 2 deletions utils/swift_build_support/swift_build_support/migration.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,9 @@ def parse_args(parser, argv):
"""
args, unknown_args = parser.parse_known_args(
list(arg for arg in argv if arg != '--'))

args, unknown_args = process_disambiguation_arguments(args, unknown_args)

args.build_script_impl_args = unknown_args
return args

Expand All @@ -58,6 +58,7 @@ def process_disambiguation_arguments(args, unknown_args):

return args, unknown_args


def check_impl_args(build_script_impl, argv):
"""
Check whether given argv are all known arguments for `build-script-impl`.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
from .. import shell
from .. import targets


class SKStressTester(product.Product):
@classmethod
def product_source_name(cls):
Expand Down Expand Up @@ -63,8 +64,8 @@ def should_build(self, host_target):
def build(self, host_target):
if platform.system() != 'Darwin':
raise RuntimeError("Unable to build {product} on a platform other "
"than Darwin".format(product=self.package_name())
)
"than Darwin".format(
product=self.package_name()))

self.run_build_script_helper('build')

Expand All @@ -82,4 +83,3 @@ def install(self, host_target):
self.run_build_script_helper('install', [
'--prefix', install_prefix
])

Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
#
# ----------------------------------------------------------------------------

from . import product
from . import skstresstester


Expand Down