commit 330b0777e1781b11e88f6a64a6ac8908123b3155
author Patrick Williams <patrick@stwcx.xyz> Mon Nov 28 06:14:06 2022 -0600
committer Patrick Williams <patrick@stwcx.xyz> Tue Nov 29 12:26:36 2022 -0600
tree 4e9fe6eeb404d5dbf365b6a020c1e0ce0fef4a27
parent d27ab4c5a5af10989b3b81de4d23b9a96bdf13d0

unit-test: always call global formatter

There has been some confusion about the relationship between the global
and local formatters (the one here vs the one in repositories).  The
previous behavior was that if the local formatter existed then the
global formatter was ignored.  In most cases this leads to duplicative
or missing functionality.

The global formatter already has some code in place for calling local
formatters as secondary formatters.  Leverage this and ensure the
global formatter is always called.

Running the following resulted in no repositories with local formatters
failing:
```
find -maxdepth 2 -name "format-code.sh" | xargs -n1 dirname | \
    xargs -n1 openbmc-build-scripts/scripts/format-code.sh
openbmc-build-scripts/scripts/format-code.sh entity-manager
```

I also manually inspected all of the format-code scripts and they all
seem safe to utilize the global formatter as well.

Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
Change-Id: I88f3266062528e7fcf6ea71515c02d2d40048ae2

scripts/format-code.sh

diff --git a/scripts/format-code.sh b/scripts/format-code.sh
index 2132317..0000189 100755
--- a/scripts/format-code.sh
+++ b/scripts/format-code.sh
@@ -245,9 +245,12 @@
 
 # Sometimes your situation is terrible enough that you need the flexibility.
 # For example, phosphor-mboxd.
-if [[ -f "format-code.sh" ]]; then
-    ./format-code.sh
-    if [ -z "$OPTION_NO_DIFF" ]; then
-        git --no-pager diff --exit-code
+for formatter in "format-code.sh" "format-code"; do
+    if [[ -x "${formatter}" ]]; then
+        echo -e "    ${BLUE}Calling secondary formatter:${NORMAL} ${formatter}"
+        "./${formatter}"
+        if [ -z "$OPTION_NO_DIFF" ]; then
+            git --no-pager diff --exit-code
+        fi
     fi
-fi
+done

scripts/unit-test.py

diff --git a/scripts/unit-test.py b/scripts/unit-test.py
index c112b97..daae582 100755
--- a/scripts/unit-test.py
+++ b/scripts/unit-test.py
@@ -1197,19 +1197,11 @@
 
     CODE_SCAN_DIR = os.path.join(WORKSPACE, UNIT_TEST_PKG)
 
-    # First validate code formatting if repo has style formatting files.
-    # The format-code.sh checks for these files.
+    # Run format-code.sh, which will in turn call any repo-level formatters.
     if FORMAT_CODE:
-        format_scripts = find_file(['format-code.sh', 'format-code'],
-                                   CODE_SCAN_DIR)
-
-        # use default format-code.sh if no other found
-        if not format_scripts:
-            format_scripts.append(os.path.join(WORKSPACE, "openbmc-build-scripts",
-                                               "scripts", "format-code.sh"))
-
-        for f in format_scripts:
-            check_call_cmd(f, CODE_SCAN_DIR)
+        check_call_cmd(os.path.join(WORKSPACE, "openbmc-build-scripts",
+                                    "scripts", "format-code.sh"),
+                       CODE_SCAN_DIR)
 
         # Check to see if any files changed
         check_call_cmd("git", "-C", CODE_SCAN_DIR,