WIP

Author: mkokryashkin

test/tarantool-c-tests/fix-argv-handling.test.c

@@ -5,17 +5,24 @@ local test = tap.test('fix-argv-handling'):skipcond({
 
 test:plan(1)
 
-local script = require('utils').exec.makecmd(arg, {
-  env = { LD_PRELOAD = 'mynewstate.so', DYLD_PRELOAD = 'mynewstate.so' },
-  redirect = '2>&1',
-})
-local output = script()
+local ffi = require('ffi')
+ffi.cdef[[
+const char *empty_argv_exec(const char *path);
+void free(void *ptr);
+]]
+local execlib = ffi.load('emptyargvexec')
+
+local cmd = require('utils').exec.luabin(arg)
+print(cmd)
+local output = execlib.empty_argv_exec(cmd)
+ffi.gc(output, ffi.C.free)
 
+output_str = ffi.string(output)
 -- Skip test for static build.
-if output:match('cannot be preloaded') then
+if output_str:match('cannot be preloaded') then
   test:ok(true, 'static build -- can not perform test')
 else
-  test:like(output, 'cannot create state', 'correct argv handling')
+  test:like(output_str, 'cannot create state', 'correct argv handling')
 end
 
 test:done(true)

test/tarantool-tests/fix-argv-handling.test.lua

@@ -1 +1,2 @@
 BuildTestCLib(mynewstate mynewstate.c)
+BuildTestCLib(libemptyargvexec empty_argv_exec.c)

test/tarantool-tests/fix-argv-handling/CMakeLists.txt

@@ -0,0 +1,41 @@
+#define _GNU_SOURCE
+#include <fcntl.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <sys/wait.h>
+#include <unistd.h>
+
+#define BUF_SIZE 1024
+#define CHECKED(call) \
+do { \
+  int status = 0; \
+  status = (call); \
+  if (status == -1) { \
+    perror(#call); \
+    exit(1); \
+  } \
+} while(0)
+
+const char *empty_argv_exec(const char *path, char *const env[]) {
+  int pipefds[2] = {};
+  CHECKED(pipe2(pipefds, O_CLOEXEC));
+
+  pid_t pid = fork();
+  if (pid == 0) {
+    CHECKED(dup2(pipefds[1], 1));
+    CHECKED(dup2(pipefds[1], 2));
+    CHECKED(execl(path, NULL));
+  }
+
+  close(pipefds[1]);
+  waitpid(pid, NULL, 0);
+  /* Kilobyte should be enough. */
+  char *buf = calloc(BUF_SIZE, sizeof(char));
+  if (buf == NULL) {
+    perror("calloc");
+    exit(1);
+  }
+  CHECKED(read(pipefds[0], buf, BUF_SIZE));
+  return buf;
+}
+

test/tarantool-tests/fix-argv-handling/empty_argv_exec.c

@@ -1,4 +1,4 @@
---- tap.lua internal file.
+---tap.lua internal file.
 ---
 --- The Test Anything Protocol version 13 producer.
 ---

test/tarantool-tests/tap.lua

@@ -1,14 +1,23 @@
 local M = {}
 
-function M.luacmd(args)
+local function executable_idx(args)
   -- arg[-1] is guaranteed to be not nil.
   local idx = -2
   while args[idx] do
     assert(type(args[idx]) == 'string', 'Command part have to be a string')
     idx = idx - 1
   end
-  -- return the full command with flags.
-  return table.concat(args, ' ', idx + 1, -1)
+  return idx + 1
+end
+
+function M.luabin(args)
+ -- Return only the executable.
+ return args[executable_idx(args)]
+end
+
+function M.luacmd(args)
+ -- Return the full command with flags.
+ return table.concat(args, ' ', executable_idx(args), -1)
 end
 
 local function makeenv(tabenv)