Merge remote-tracking branch 'origin/master' into master-llvm-swift5-transition

Author: swift-ci

test/lit.site.cfg.in

@@ -89,6 +89,11 @@ config.available_features.add("CMAKE_GENERATOR=@CMAKE_GENERATOR@")
 if "@SWIFT_ENABLE_SOURCEKIT_TESTS@" == "TRUE":
     config.available_features.add('sourcekit')
 
+if "@SWIFT_ENABLE_GUARANTEED_NORMAL_ARGUMENTS@" == "FALSE":
+   config.available_features.add('plus_one_runtime')
+else:
+   config.available_features.add('plus_zero_runtime')
+
 # Let the main config do the real work.
 if config.test_exec_root is None:
     config.test_exec_root = os.path.dirname(os.path.realpath(__file__))