Skip to content

Commit 3f05de8

Browse files
equalsrafequalsraf
authored andcommitted
Fix connectToSocket path passed to nvim
When testing local socket connections in Unix there is one case when we use a relative path (without starting w/ ./). In this case we observe failures to connect to neovim in our CI.
1 parent 8a3ac03 commit 3f05de8

File tree

1 file changed

+9
-1
lines changed

1 file changed

+9
-1
lines changed

test/tst_neovimconnector.cpp

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,7 @@ private slots:
9595
QTest::addColumn<QString>("socketname");
9696

9797
QTest::newRow("relative") << "relnvimsock";
98+
QTest::newRow("./relative") << "./relnvimsock";
9899
QTest::newRow("absolute") << QFileInfo("absnvimsock").absoluteFilePath();
99100
}
100101

@@ -109,7 +110,14 @@ private slots:
109110
QProcess p;
110111
p.setProgram("nvim");
111112
QProcessEnvironment env = QProcessEnvironment::systemEnvironment();
112-
env.insert("NVIM_LISTEN_ADDRESS", socketname);
113+
114+
auto path_info = QFileInfo(socketname);
115+
if (path_info.isAbsolute()) {
116+
env.insert("NVIM_LISTEN_ADDRESS", socketname);
117+
}
118+
else {
119+
env.insert("NVIM_LISTEN_ADDRESS", "./" + socketname);
120+
}
113121
p.setProcessEnvironment(env);
114122
p.setArguments({"--headless", "-u", "NONE"});
115123
p.start();

0 commit comments

Comments
 (0)