Migrate integration tests to C.

The Perl integration tests were migrated as faithfully as possible, but there was some cruft and a few unit tests that it did not make sense to migrate.

Also remove all Perl code made obsolete by this migration.

All unit, performance, and integration tests are now written in C but significant parts of the test harness remain to be migrated.

.github/workflows/test.yml

@@ -32,13 +32,13 @@ jobs:
           - param: test --vm=d10 --param=no-performance --param=c-only
 
           # All integration tests for 32-bit
-          - param: test --vm=d10 --param=module=mock --param=module=real
+          - param: test --vm=d10 --param=module=mock --param=module=integration
 
           # Debian/Ubuntu documentation
           - param: doc --vm=u20
 
           # All integration tests
-          - param: test --vm=u22 --param=build-package --param=module=mock --param=module=real
+          - param: test --vm=u22 --param=build-package --param=module=mock --param=module=integration
 
           # All unit tests with coverage, backtrace and alternate timezone
           - param: test --vm=u22 --param=c-only --param=no-valgrind --param=tz=America/New_York
@@ -53,7 +53,7 @@ jobs:
           - param: doc --vm=rh8
 
           # All integration tests
-          - param: test --vm=rh7 --param=module=mock --param=module=real
+          - param: test --vm=rh7 --param=module=mock --param=module=integration
 
     steps:
       - name: Checkout Code

doc/lib/pgBackRestDoc/Common/DocExecute.pm

@@ -16,11 +16,11 @@ use File::Basename qw(dirname);
 use Storable qw(dclone);
 
 use pgBackRestTest::Common::ExecuteTest;
-use pgBackRestTest::Common::HostTest;
-use pgBackRestTest::Common::HostGroupTest;
 
 use pgBackRestDoc::Common::DocManifest;
 use pgBackRestDoc::Common::Exception;
+use pgBackRestDoc::Common::Host;
+use pgBackRestDoc::Common::HostGroup;
 use pgBackRestDoc::Common::Ini;
 use pgBackRestDoc::Common::Log;
 use pgBackRestDoc::Common::String;
@@ -1050,7 +1050,7 @@ sub sectionChildProcess
                     $strOption =~ s/\{\[host\-repo\-path\]\}/${strHostRepoPath}/g;
                 }
 
-                my $oHost = new pgBackRestTest::Common::HostTest(
+                my $oHost = new pgBackRestDoc::Common::Host(
                     $$hCacheKey{name}, "doc-$$hCacheKey{name}", $strImage, $strHostUser,
                     defined($strMount) ? [$strMount] : undef, $strOption, $$hCacheKey{param}, $$hCacheKey{'update-hosts'});
 

test/lib/pgBackRestTest/Common/HostTest.pm → doc/lib/pgBackRestDoc/Common/Host.pm

@@ -1,7 +1,7 @@
 ####################################################################################################################################
-# HostTest.pm - Encapsulate a docker host for testing
+# HostTest.pm - Encapsulate a docker host
 ####################################################################################################################################
-package pgBackRestTest::Common::HostTest;
+package pgBackRestDoc::Common::Host;
 
 ####################################################################################################################################
 # Perl includes

test/lib/pgBackRestTest/Common/HostGroupTest.pm → doc/lib/pgBackRestDoc/Common/HostGroup.pm

@@ -1,7 +1,7 @@
 ####################################################################################################################################
-# HostGroupTest.pm - Encapsulate a group of docker containers for testing
+# HostGroupTest.pm - Encapsulate a group of docker containers
 ####################################################################################################################################
-package pgBackRestTest::Common::HostGroupTest;
+package pgBackRestDoc::Common::HostGroup;
 
 ####################################################################################################################################
 # Perl includes
@@ -177,7 +177,7 @@ sub hostGroupGet
 {
     if (!defined($oHostGroup))
     {
-        $oHostGroup = new pgBackRestTest::Common::HostGroupTest();
+        $oHostGroup = new pgBackRestDoc::Common::HostGroup();
     }
 
     return $oHostGroup;

src/build/common/exec.c

@@ -9,10 +9,11 @@ Execute Process Extensions
 
 /**********************************************************************************************************************************/
 static String *
-execProcess(Exec *const this)
+execProcess(Exec *const this, const ExecOneParam param)
 {
     FUNCTION_LOG_BEGIN(logLevelDebug);
         FUNCTION_LOG_PARAM(EXEC, this);
+        FUNCTION_LOG_PARAM(INT, param.resultExpect);
     FUNCTION_LOG_END();
 
     String *const result = strNew();
@@ -35,7 +36,7 @@ execProcess(Exec *const this)
         // If the process exited normally but without a success status
         if (WIFEXITED(processStatus))
         {
-            if (WEXITSTATUS(processStatus) != 0)
+            if (WEXITSTATUS(processStatus) != param.resultExpect)
                 execCheckStatusError(this, processStatus, strTrim(result));
         }
         // Else if the process did not exit normally then it must have been a signal
@@ -53,31 +54,32 @@ execOne(const String *const command, const ExecOneParam param)
 {
     FUNCTION_LOG_BEGIN(logLevelDebug);
         FUNCTION_LOG_PARAM(STRING, command);
-        (void)param;
+        FUNCTION_LOG_PARAM(STRING, param.shell);
+        FUNCTION_LOG_PARAM(INT, param.resultExpect);
     FUNCTION_LOG_END();
 
     String *result = NULL;
 
     MEM_CONTEXT_TEMP_BEGIN()
     {
         const StringList *const shellList = strLstNewSplitZ(param.shell != NULL ? param.shell : STRDEF("sh -c"), " ");
-        StringList *const param = strLstNew();
+        StringList *const paramList = strLstNew();
 
         ASSERT(strLstSize(shellList) != 0);
 
         for (unsigned int shellIdx = 1; shellIdx < strLstSize(shellList); shellIdx++)
-            strLstAdd(param, strLstGet(shellList, shellIdx));
+            strLstAdd(paramList, strLstGet(shellList, shellIdx));
 
-        strLstAddFmt(param, "%s 2>&1", strZ(command));
-        strLstAddZ(param, "2>&1");
+        strLstAddFmt(paramList, "%s 2>&1", strZ(command));
+        strLstAddZ(paramList, "2>&1");
 
-        Exec *const exec = execNew(strLstGet(shellList, 0), param, command, ioTimeoutMs());
+        Exec *const exec = execNew(strLstGet(shellList, 0), paramList, command, ioTimeoutMs());
 
         execOpen(exec);
 
         MEM_CONTEXT_PRIOR_BEGIN()
         {
-            result = execProcess(exec);
+            result = execProcess(exec, param);
         }
         MEM_CONTEXT_PRIOR_END();
     }

src/build/common/exec.h

@@ -17,6 +17,7 @@ typedef struct ExecOneParam
 {
     VAR_PARAM_HEADER;
     const String *shell;                                            // Shell command to use for exec (default is sh -c)
+    int resultExpect;                                               // Expected result, if not 0
 } ExecOneParam;
 
 #define execOneP(command, ...)                                                                                                     \

test/certificate/pgbackrest-test-server.cnf

@@ -37,6 +37,6 @@ DNS.4 = 127.0.0.1
 IP.1 = 127.0.0.1
 
 # Used in integration tests
-DNS.5 = db-primary
-DNS.6 = db-standby
-DNS.7 = backup
+DNS.5 = pg1
+DNS.6 = pg2
+DNS.7 = repo

test/certificate/pgbackrest-test-server.crt

@@ -1,8 +1,8 @@
 -----BEGIN CERTIFICATE-----
-MIIGAjCCA+qgAwIBAgIUW0gPWoZD5DqjIWIP3PliYA0IAOQwDQYJKoZIhvcNAQEL
+MIIF8jCCA9qgAwIBAgIUJCya0E5vFzyH2AgiM3HSAHmpZ1QwDQYJKoZIhvcNAQEL
 BQAwXDELMAkGA1UEBhMCVVMxDDAKBgNVBAgMA0FsbDEMMAoGA1UEBwwDQWxsMRMw
 EQYDVQQKDApwZ0JhY2tSZXN0MRwwGgYDVQQDDBN0ZXN0LnBnYmFja3Jlc3Qub3Jn
-MCAXDTIxMDgyNjEyMjkwM1oYDzIyOTUwNjEwMTIyOTAzWjB6MQswCQYDVQQGEwJV
+MCAXDTI0MDMwNDAxMzgzMFoYDzIyOTcxMjE3MDEzODMwWjB6MQswCQYDVQQGEwJV
 UzEMMAoGA1UECAwDQWxsMQwwCgYDVQQHDANBbGwxEzARBgNVBAoMCnBnQmFja1Jl
 c3QxHDAaBgNVBAsME1VuaXQgVGVzdGluZyBEb21haW4xHDAaBgNVBAMME3Rlc3Qu
 cGdiYWNrcmVzdC5vcmcwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDD
@@ -16,20 +16,19 @@ dCdyXuSftGFx0JxvmDhl9qFGarv1BKgwO83j7sy3IREte1K21JaIHNBVWP+NwU0N
 4Z4OMqnpnnnGiyi0xnfJVqOXghu5BLWl9MuOntZ0nnzLmFD7w795uNRgjE6jmRmF
 FlX+PGqhHsZr0wZsBDsE9xO4i2l8aqJZx1hT5l3LIXC+lei/qo2gJi3nyePuz4UB
 t53sTNEdrZndFUaRyq/aJfkR13J0eaoqKn5BRRHhw8tRef6S84e0kQ6ABYNRGHQN
-V+GswPl1fV37114FTBnz2Bi/GSQSs8vWjw49HHKK5wIDAQABo4GbMIGYMAkGA1Ud
-EwQCMAAwCwYDVR0PBAQDAgXgMH4GA1UdEQR3MHWCE3Rlc3QucGdiYWNrcmVzdC5v
+V+GswPl1fV37114FTBnz2Bi/GSQSs8vWjw49HHKK5wIDAQABo4GLMIGIMAkGA1Ud
+EwQCMAAwCwYDVR0PBAQDAgXgMG4GA1UdEQRnMGWCE3Rlc3QucGdiYWNrcmVzdC5v
 cmeCFSoudGVzdC5wZ2JhY2tyZXN0Lm9yZ4IWKi50ZXN0Mi5wZ2JhY2tyZXN0Lm9y
-Z4IJMTI3LjAuMC4xhwR/AAABggpkYi1wcmltYXJ5ggpkYi1zdGFuZGJ5ggZiYWNr
-dXAwDQYJKoZIhvcNAQELBQADggIBAMbSq1/hjvQZJ2PFE/VVz9OcA7vlewq632eE
-P5BalSJJgLVEsv1AxPx8VT08xfFQHQtEcCg/PFqT3RQ5yb1kHfa6glJkjYIdKQbn
-lv9OVc/iutQwKPwk32QQjSgQFb/m0tXv9SlQ+gNTdkK4UKffXPj5rpgwaSiVwuLF
-d+3TUpJihS48LLRC27kcL5Ur69/fu0ZD7xZSoCr/n8MUq4f9LwOhBqq+h64wM9cV
-V79iPWmEJXoNAJrPYmK+XNhcro071c4m+HR4CCNikjxz/GUUf/NGHWT3pL0Ildku
-X3dHmsNRVT/wLqi2v2oa6zr9FfVzjDAdCfnvTLOJ6H6dmofzQUFJBSWfhqGNDR8U
-oblwirM2sjaOUjnkBS6Cb26yHSClStI+GZvS0KZfSVd2Qbe4YmtQMTNl/hdZGK3z
-ZoqV++idVR+A0NQP8xR4VWqQdq0BR5eQOXDA4wtqvivqlIXpbJvqh1kBHPU9cAF+
-g/t3Wa7EomwLazRaV9djLUpon6wGwScKJGzv+vyQSgXN1tQG9tLV4NCFUKDueUUZ
-U/j1t64KF9hp5NU2A16zLp6V5GPIJhufXOYa66AFjV8c880eLd5YlkfzgyYwReOx
-7vHkiLylbx2tc6aYUqdwjpMwnkxTsn52BBVxDvXToBIRdq/ea/LnZ/yhpnaac/Um
-bJOTMee+
+Z4IJMTI3LjAuMC4xhwR/AAABggNwZzGCA3BnMoIEcmVwbzANBgkqhkiG9w0BAQsF
+AAOCAgEAX0MEXH6ANllRhdQz6neQ7SVG48Aj1lEAGeOhfpoNKzuyBcRjVw7+NyNN
+IwlPKSSBDpnxaWQ5rCLtBtXod6yPMGKTRlFHwFFzfOps6nlRQjPsA848d6daLBvj
+unpUQx4NFGPZJSs6z5z4BlT/+5mJVHC9qsrZBtkndYpRWo37xbVhRqP0+FSTbzrx
+Gj2td3PoqQBgA/AmSKIpwagGzw7cSor1r4uEjkVxxyOMRbjuuASHMHUM7MtQV3YR
+rz9UspvGfoKBdUkzMoqKRwxZWuh+uAoM+1GWXBjqlN6uAdQxpV2wZ75iRJp3Y4Bk
+/CkXTLZ83lARGLqS/E5EFfg7Z9Bre2f5fHzV8C/h6WGpvCt/GlZqTx8fix/mMPT2
+CFq+FcSmvF5JsIMxUnpvTw1hcTDNRPnOkFKnO1bjf9+jGCwzDUoGReYpb5veFSxh
+IFkQ3oyw3/6v11aPstXSADTvRTFMyRklqu5NIHkMVQCPwQCAE3346KpEsT5HO2T7
+X57sP05alMESjUv1sR260yYC3GUr0dbmf8gthVDhH1SsP3Drn/A3l70xGASnJA46
+LCZwAJZ0KI6G/ok17lTZe9Hjwn2DkmVf1CKD7gXjmroYQI9O+etUtD/g+B2AISTG
+SP60NakteOBWqmcSirV5npKh/SZR8Il5oaLS+3HerhgwvNDJ078=
 -----END CERTIFICATE-----

test/ci.pl

@@ -183,7 +183,7 @@ sub processEnd
         # Build list of packages that need to be installed
         my $strPackage =
             "make gcc ccache python3-pip git rsync zlib1g-dev libssl-dev libxml2-dev libpq-dev libyaml-dev pkg-config" .
-            " uncrustify libssh2-1-dev";
+            " uncrustify libssh2-1-dev valgrind";
 
         # Add lcov when testing coverage
         if (vmCoverageC($strVm))
@@ -194,7 +194,7 @@ sub processEnd
         # Extra packages required when testing without containers
         if ($strVm eq VM_NONE)
         {
-            $strPackage .= " valgrind liblz4-dev liblz4-tool zstd libzstd-dev bzip2 libbz2-dev";
+            $strPackage .= " liblz4-dev liblz4-tool zstd libzstd-dev bzip2 libbz2-dev";
         }
         # Else packages needed for integration tests on containers
         else

test/define.yaml

@@ -608,7 +608,9 @@ unit:
       # ----------------------------------------------------------------------------------------------------------------------------
       - name: sftp
         total: 19
-        harness: libSsh2
+        harness:
+          name: libSsh2
+          integration: false
         harness:
           name: fd
           shim:
@@ -635,7 +637,9 @@ unit:
       # ----------------------------------------------------------------------------------------------------------------------------
       - name: client
         total: 1
-        harness: pq
+        harness:
+          name: pq
+          integration: false
 
         coverage:
           - postgres/client
@@ -881,6 +885,7 @@ unit:
         total: 12
         harness:
           name: backup
+          integration: false
           shim:
             command/backup/backup:
               function:
@@ -1004,13 +1009,14 @@ unit:
 integration:
 
   # ********************************************************************************************************************************
-  - name: real
+  - name: integration
     db: true
 
     test:
       # ----------------------------------------------------------------------------------------------------------------------------
       - name: all
         total: 1
+        harness: host
 
 # **********************************************************************************************************************************
 # Performance tests

test/lib/pgBackRestTest/Common/CoverageTest.pm

@@ -26,7 +26,31 @@ use pgBackRestTest::Common::ContainerTest;
 use pgBackRestTest::Common::DefineTest;
 use pgBackRestTest::Common::ExecuteTest;
 use pgBackRestTest::Common::ListTest;
-use pgBackRestTest::Common::RunTest;
+
+####################################################################################################################################
+# testRunName
+#
+# Create module/test names by upper-casing the first letter and then inserting capitals after each -.
+####################################################################################################################################
+sub testRunName
+{
+    my $strName = shift;
+    my $bInitCapFirst = shift;
+
+    $bInitCapFirst = defined($bInitCapFirst) ? $bInitCapFirst : true;
+    my $bFirst = true;
+
+    my @stryName = split('\-', $strName);
+    $strName = undef;
+
+    foreach my $strPart (@stryName)
+    {
+        $strName .= ($bFirst && $bInitCapFirst) || !$bFirst ? ucfirst($strPart) : $strPart;
+        $bFirst = false;
+    }
+
+    return $strName;
+}
 
 ####################################################################################################################################
 # Generate an lcov configuration file