bulid-script: simplify code and use more idiomatic variable names

Author: gribozavr

CMakeLists.txt

@@ -44,9 +44,9 @@ option(SWIFT_BUILD_STATIC_STDLIB
     "Build static variants of the Swift standard library and SDK overlay"
     FALSE)
 
-option(SWIFT_INCLUDE_BENCHMARKS
-    "Create targets for running swift benchmarks"
-    TRUE)
+option(SWIFT_BUILD_PERF_TESTSUITE
+    "Create targets for swift performance benchmarks."
+    FALSE)
 
 option(SWIFT_INCLUDE_TESTS "Create targets for building/running tests." TRUE)
 
@@ -633,7 +633,7 @@ if(SWIFT_BUILD_TOOLS)
 endif()
 add_subdirectory(utils)
 add_subdirectory(stdlib)
-if(SWIFT_INCLUDE_BENCHMARKS)
+if(SWIFT_BUILD_PERF_TESTSUITE)
   add_subdirectory(benchmark)
 endif()
 if(SWIFT_INCLUDE_TESTS)

benchmark/CMakeLists.txt

@@ -1,13 +1,10 @@
-option(SWIFT_INCLUDE_PERF_TESTSUITE "Create targets for swift performance benchmarks." NO)
 if(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
   # Performance test harness only builds on Darwin.
-  if (SWIFT_INCLUDE_PERF_TESTSUITE)
-    set(PERF_TESTSUITE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/PerfTestSuite" CACHE STRING "Path to swift performance testsuite repo.")
-    if(EXISTS ${PERF_TESTSUITE_DIR}/CMakeLists.txt)
-      add_subdirectory(${PERF_TESTSUITE_DIR})
-    else()
-      message(FATAL_ERROR "Can't find the Swift performance suite at ${PERF_TESTSUITE_DIR}/.")
-    endif()
+  set(PERF_TESTSUITE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/PerfTestSuite" CACHE STRING "Path to swift performance testsuite repo.")
+  if(EXISTS ${PERF_TESTSUITE_DIR}/CMakeLists.txt)
+    add_subdirectory(${PERF_TESTSUITE_DIR})
+  else()
+    message(FATAL_ERROR "Can't find the Swift performance suite at ${PERF_TESTSUITE_DIR}/.")
   endif()
 endif()
 

utils/build-script-impl

@@ -698,10 +698,10 @@ function not() {
 
 function true_false() {
     case "$1" in
-        false | 0)
+        false | FALSE | 0)
             echo "FALSE"
             ;;
-        true | 1)
+        true | TRUE | 1)
             echo "TRUE"
             ;;
         *)
@@ -1322,15 +1322,6 @@ function cmake_config_opt() {
     fi
 }
 
-function should_build_perftestsuite() {
-    if [ "$(uname -s)" != Darwin ]; then
-        echo "FALSE"
-        return
-    fi
-
-    true_false "${BUILD_SWIFT_PERF_TESTSUITE}"
-}
-
 function set_swiftpm_bootstrap_command() {
     swiftpm_bootstrap_command=()
 
@@ -1480,13 +1471,6 @@ for deployment_target in "${NATIVE_TOOLS_DEPLOYMENT_TARGETS[@]}" "${CROSS_TOOLS_
         )
     fi
 
-    if [[ $(should_build_perftestsuite) == "TRUE" ]]; then
-        swift_cmake_options=(
-            "${swift_cmake_options[@]}"
-            -DSWIFT_INCLUDE_PERF_TESTSUITE=YES
-        )
-    fi
-
     swift_cmake_options=(
         "${swift_cmake_options[@]}"
         -DSWIFT_AST_VERIFIER:BOOL=$(true_false "${SWIFT_ENABLE_AST_VERIFIER}")
@@ -1694,7 +1678,7 @@ for deployment_target in "${NATIVE_TOOLS_DEPLOYMENT_TARGETS[@]}" "${CROSS_TOOLS_
                 fi
 
                 build_targets=(all "${SWIFT_STDLIB_TARGETS[@]}")
-                if [[ $(should_build_perftestsuite) == "TRUE" ]]; then
+                if [[ $(true_false "${build_perf_testsuite_this_time}") == "TRUE" ]]; then
                     native_swift_tools_path=$(build_directory macosx-x86_64 swift)/bin
                     cmake_options=(
                         "${cmake_options[@]}"