Merge branch 'integration' into dws-a324-ci

# Conflicts:
#	.github/workflows/test.yml
#	test/src/common/harnessHost.c

Author: dwsteele

.github/workflows/test.yml

@@ -50,7 +50,7 @@ jobs:
           # All unit tests on the newest gcc available
           - param: test --vm=f44 --param=c-only --param=no-valgrind --param=no-coverage --param=no-performance
 
-          # All unit tests on musl libc
+          # All unit and integration tests on musl libc
           - param: test --vm=a321 --param=no-coverage --param=no-performance
 
           # All unit tests on musl libc

test/src/common/harnessHost.c

@@ -937,17 +937,16 @@ hrnHostPgBinPath(HrnHost *const this)
     {
         MEM_CONTEXT_TEMP_BEGIN()
         {
-            // Possible bin paths for Debian, RHEL, and Alpine
+            const String *pgPath = NULL;
             const char *const version = strZ(pgVersionToStr(hrnHostPgVersion()));
+
             const String *const pgPathList[] =
             {
-                strNewFmt("/usr/lib/postgresql/%s/bin", version),
-                strNewFmt("/usr/pgsql-%s/bin", version),
-                strNewFmt("/usr/libexec/postgresql%s", version),
+                strNewFmt("/usr/lib/postgresql/%s/bin", version),   // Debian
+                strNewFmt("/usr/pgsql-%s/bin", version),            // RHEL
+                strNewFmt("/usr/libexec/postgresql%s", version),    // Alpine
             };
 
-            const String *pgPath = NULL;
-
             for (unsigned int pgPathIdx = 0; pgPath == NULL && pgPathIdx < LENGTH_OF(pgPathList); pgPathIdx++)
             {
                 TRY_BEGIN()