Fixed hard-coded default values in the expected_options module used for generating argument parser tests.

Author: Rostepher

utils/build_swift/tests/expected_options.py

@@ -9,6 +9,9 @@
 
 import multiprocessing
 
+from swift_build_support.swift_build_support import host
+from swift_build_support.swift_build_support import targets
+
 from .. import argparse
 from .. import defaults
 
@@ -123,12 +126,9 @@
     'host_cxx': None,
     'host_libtool': None,
     'host_lipo': None,
-    # FIXME: determine actual default value rather than hardcode
-    'host_target': 'macosx-x86_64',
+    'host_target': targets.StdlibDeploymentTarget.host_target().name,
     'host_test': False,
-    # FIXME: determine actual default value rather than hardcode
-    'install_prefix': '/Applications/Xcode.app/Contents/Developer/Toolchains/'
-                      'XcodeDefault.xctoolchain/usr',
+    'install_prefix': targets.install_prefix(),
     'install_symroot': None,
     'ios': False,
     'ios_all': False,
@@ -140,7 +140,8 @@
     'lldb_build_variant': 'Debug',
     'llvm_assertions': True,
     'llvm_build_variant': 'Debug',
-    'llvm_max_parallel_lto_link_jobs': 0,
+    'llvm_max_parallel_lto_link_jobs':
+        host.max_lto_link_job_counts()['llvm'],
     'llvm_targets_to_build': 'X86;ARM;AArch64;PowerPC;SystemZ;Mips',
     'long_test': False,
     'lto_type': None,
@@ -153,7 +154,8 @@
     'swift_compiler_version': None,
     'swift_stdlib_assertions': True,
     'swift_stdlib_build_variant': 'Debug',
-    'swift_tools_max_parallel_lto_link_jobs': 0,
+    'swift_tools_max_parallel_lto_link_jobs':
+        host.max_lto_link_job_counts()['swift'],
     'swift_user_visible_version': defaults.SWIFT_USER_VISIBLE_VERSION,
     'symbols_package': None,
     'test': None,