Skip to content

VSharp process start fix #1484

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 7, 2022
Merged

VSharp process start fix #1484

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 0 additions & 20 deletions utbot-rider/src/dotnet/UtBot/UtBot.Rd/RdWriter.cs
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion utbot-rider/src/dotnet/UtBot/UtBot.VSharp/VSharpMain.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ public static class VSharpMain
public static readonly string VSharpProcessName = "VSharp";
public static void Main(string[] args)
{
// TextWriter);
using var blockingQueue = new BlockingCollection<string>(1);
var port = int.Parse(args[0]);
var ldef = new LifetimeDefinition();
Expand Down
8 changes: 2 additions & 6 deletions utbot-rider/src/dotnet/UtBot/UtBot/ProcessWithRdServer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ public ProcessWithRdServer(string name, int port, string exePath, IShellLocks sh
var wire = new SocketWire.Server(Lifetime, scheduler, socket);
var serializers = new Serializers();
var identities = new Identities(IdKind.Server);
var startInfo = new ProcessStartInfo(exePath, $"{port}");
var startInfo = new ProcessStartInfo("dotnet", $"{exePath} {port}");
Protocol = new Protocol(name, serializers, identities, scheduler, wire, Lifetime);
scheduler.Queue(() =>
{
Expand All @@ -53,14 +53,10 @@ public ProcessWithRdServer(string name, int port, string exePath, IShellLocks sh
blockingCollection.TryAdd(s);
}
});
// VSharpModel.?
});
_process = new Process();
// _process.ErrorDataReceived;
// _process.EnableRaisingEvents;
// _process.
Lifetime.OnTermination(() => _process.Kill(entireProcessTree: true));
_process.StartInfo = startInfo;
Lifetime.OnTermination(() => _process.Kill(entireProcessTree: true));
if (_process.Start())
_process.Exited += (_, _) => _ldef.Terminate();
else
Expand Down
2 changes: 1 addition & 1 deletion utbot-rider/src/dotnet/UtBot/UtBot/UnitTestBuilder.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ private void Generate(IBackgroundProgressIndicator progressIndicator, IProject p
project.Locks.AssertNonMainThread();
var pluginPath = FileSystemPath.Parse(Assembly.GetExecutingAssembly().Location)
.Parent;
var vsharpRunner = pluginPath.Combine("UtBot.VSharp");
var vsharpRunner = pluginPath.Combine("UtBot.VSharp.dll");
var port = NetworkUtil.GetFreePort();
var proc = new ProcessWithRdServer(VSharpMain.VSharpProcessName, port, vsharpRunner.FullPath, project.Locks, _lifetime);
var projectCsprojPath = project.ProjectFileLocation.FullPath;
Expand Down