ci: build and test tntcxx on macos 11 and 12

.github/workflows/ubuntu.yml → .github/workflows/testing.yml

@@ -1,4 +1,4 @@
-name: ubuntu
+name: testing
 
 on:
   workflow_dispatch:
@@ -15,28 +15,43 @@ jobs:
         runs-on:
           - ubuntu-20.04
           - ubuntu-22.04
-        tarantool:
-          - '2.11'
+          - macos-11
+          - macos-12
         mode:
           - Debug
           - Release
+        test-ssl:
+          - Disabled
 
     runs-on: ${{ matrix.runs-on }}
 
+    name: ${{ matrix.runs-on }} (${{ matrix.mode }}, ${{ matrix.test-ssl }} ssl test)
+
     steps:
       - name: Clone the connector
         uses: actions/checkout@v3
 
-      - name: Setup tarantool ${{ matrix.tarantool }}
+      - name: Setup tarantool 2.11
+        if: startsWith(matrix.runs-on, 'ubuntu')
         uses: tarantool/setup-tarantool@v1
         with:
-          tarantool-version: ${{ matrix.tarantool }}
+          tarantool-version: '2.11'
+
+      - name: Setup stable tarantool from brew
+        if: startsWith(matrix.runs-on, 'macos')
+        run: brew install tarantool
 
       - name: build
         run: |
           mkdir build
           cd build
-          cmake -DCMAKE_BUILD_TYPE=${{ matrix.mode }} -DTNTCXX_BUILD_TESTING=ON -DTNTCXX_ENABLE_SSL=OFF .. 
+          cmake -DCMAKE_BUILD_TYPE=${{ matrix.mode }} -DTNTCXX_BUILD_TESTING=ON -DTNTCXX_ENABLE_SSL=ON ..
           make -j
+
+      - name: test without SSL
+        if: matrix.test-ssl == 'Disabled'
+        run: cd build && ctest --output-on-failure -E ClientSSL.test
+
       - name: test
+        if: matrix.test-ssl == 'Enabled'
         run: cd build && ctest --output-on-failure

src/Utils/Traits.hpp

@@ -81,6 +81,7 @@
  */
 
 #include <cstddef>
+#include <iterator>
 #include <tuple>
 #include <type_traits>
 #include <variant>

test/EncDecTest.cpp

@@ -33,6 +33,7 @@
 
 #include <set>
 #include <map>
+#include <vector>
 
 #include "Utils/Helpers.hpp"
 #include "Utils/RefVector.hpp"

test/Utils/System.hpp

@@ -62,6 +62,8 @@ set_parent_death_signal(pid_t ppid_before_fork, const char *child_program_name)
 	}
 }
 
+#ifdef __linux__
+
 inline int
 launchTarantool(bool enable_ssl = false)
 {
@@ -85,6 +87,64 @@ launchTarantool(bool enable_ssl = false)
 	exit(EXIT_FAILURE);
 }
 
+#else
+
+/**
+ * Launches intermediate process, connected with parent by pipe.
+ * The intermediate process lauches another process, running tarantool, and then
+ * falls asleep on reading from pipe. When parent process is dead, the pipe
+ * will be closed, and the intermediate process will read EOF. Right after, it
+ * will kill its child process, which is Tarantool, and exit.
+ * In the case, when the intermediate process fails to fork Tarantool, it kills
+ * the parent process and terminates.
+ */
+inline int
+launchTarantool(bool enable_ssl = false)
+{
+	pid_t ppid_before_fork = getpid();
+	int p[2];
+	pipe(p);
+	pid_t pid = fork();
+	if (pid == -1) {
+		fprintf(stderr, "Can't launch Tarantool: fork failed! %s",
+			strerror(errno));
+		return -1;
+	}
+	/* Returning from parent. */
+	if (pid != 0)
+		return 0;
+
+	/*
+	 * It is necessary to close write end of pipe here if we want to read
+	 * EOF when the parent process is dead.
+	 */
+	close(p[1]);
+	pid = fork();
+	if (pid == -1) {
+		/*
+		 * We've already returned OK in the parent, so let's kill it if
+		 * the intermediate process fails to fork Tarantool.
+		 */
+		kill(ppid_before_fork, SIGKILL);
+		exit(EXIT_FAILURE);
+	}
+	if (pid == 0) {
+		close(p[0]);
+		const char *script = enable_ssl ? "test_cfg_ssl.lua" : "test_cfg.lua";
+		if (execlp("tarantool", "tarantool", script, NULL) == -1) {
+			fprintf(stderr, "Can't launch Tarantool: execlp failed! %s\n",
+			strerror(errno));
+			kill(getppid(), SIGKILL);
+		}
+	}
+	char buf[1];
+	read(p[0], buf, 1);
+	kill(pid, SIGTERM);
+	exit(0);
+}
+
+#endif
+
 inline int
 cleanDir() {
 	pid_t pid = fork();