From c5957f6760ca3319921b4d26d5ce787fe1aad946 Mon Sep 17 00:00:00 2001
From: George Barnett <gbarnett@apple.com>
Date: Tue, 16 Mar 2021 18:38:39 +0000
Subject: [PATCH] Support multiple shared files in the allocation counter test
 framework (#1782)

Motivation:

The allocation counter test framework only supports a single shared
file which is quite limiting, especially if you rely on generated code.

Modifications:

- The '-s' option can now be passed multiple times
- The symlink name for any of the passed files will be the basename of
  the provided file rather than 'shared.swift'

Result:

Allocation counter test framework can use more than one shared file.
---
 .../run-allocation-counter.sh                 | 32 +++++++++++--------
 1 file changed, 18 insertions(+), 14 deletions(-)

diff --git a/IntegrationTests/allocation-counter-tests-framework/run-allocation-counter.sh b/IntegrationTests/allocation-counter-tests-framework/run-allocation-counter.sh
index 2c1959af..2da85e14 100755
--- a/IntegrationTests/allocation-counter-tests-framework/run-allocation-counter.sh
+++ b/IntegrationTests/allocation-counter-tests-framework/run-allocation-counter.sh
@@ -112,7 +112,7 @@ EOF
 }
 
 # <target> <template> <swiftpm_pkg_root> <swiftpm_pkg_name> <hooked_function_module> <bootstrap_module>
-# <shared file> <extra_dependencies_file> <modules...> -- <test_files...>
+# <extra_dependencies_file> <shared files...> -- <modules...> -- <test_files...>
 function build_package() {
     local target=$1
     local template=$2
@@ -120,9 +120,15 @@ function build_package() {
     local swiftpm_pkg_name=$4
     local hooked_function_module=$5
     local bootstrap_module=$6
-    local shared_file=$7
-    local extra_dependencies_file=$8
-    shift 8
+    local extra_dependencies_file=$7
+    shift 7
+
+    local shared_files=()
+    while [[ "$1" != "--" ]]; do
+        shared_files+=( "$1" )
+        shift
+    done
+    shift
 
     local modules=()
     while [[ "$1" != "--" ]]; do
@@ -176,9 +182,10 @@ function build_package() {
 EOF
         ln -s "$f" "Sources/Test_$module/file.swift"
         ln -s "../../scaffolding.swift" "Sources/Test_$module/"
-        if [[ -n "$shared_file" ]]; then
-            ln -s "$shared_file" "Sources/Test_$module/shared.swift"
-        fi
+        for shared_file in "${shared_files[@]+"${shared_files[@]}"}"; do
+            name=$(basename "$shared_file")
+            ln -s "$shared_file" "Sources/Test_$module/$name"
+        done
     done
     hooked_package_swift_end >> Package.swift
 
@@ -201,7 +208,7 @@ function find_swiftpm_package_name() {
 
 do_hooking=true
 pkg_root="$here/.."
-shared_file=""
+shared_files=()
 modules=()
 extra_dependencies_file=""
 tmp_dir="/tmp"
@@ -212,7 +219,7 @@ while getopts "ns:p:m:d:t:" opt; do
             do_hooking=false
             ;;
         s)
-            shared_file="$OPTARG"
+            shared_files+=( $(abs_path "$OPTARG") )
             ;;
         p)
             pkg_root=$(abs_path "$OPTARG")
@@ -250,10 +257,6 @@ for f in "$@"; do
     files+=( "$(abs_path "$f")" )
 done
 
-if [[ -n "$shared_file" ]]; then
-    shared_file=$(abs_path "$shared_file")
-fi
-
 test -d "$pkg_root" || die "package root '$pkg_root' not a directory"
 for f in "${files[@]}"; do
     test -f "$f" || die "file '$f' not a file"
@@ -276,8 +279,9 @@ build_package \
     "$(find_swiftpm_package_name "$pkg_root")" \
     "$selected_hooked_functions" \
     "$selected_bootstrap" \
-    "$shared_file" \
     "$extra_dependencies_file" \
+    "${shared_files[@]+"${shared_files[@]}"}" \
+    -- \
     "${modules[@]}" \
     -- \
     "${files[@]}"