citrun

commit 7bf9c8071d19ad0edcdf7856e4c3c911c03443a7
parent b564619421cc2082b642b7b527dd05600c3fe108
Author: Kyle Milz <kyle@getaddrinfo.net>
Date:   Sun, 13 Mar 2016 13:34:39 -0600

use a viewer socket in the cwd instead of hardcoded /tmp

Diffstat:
M
SCV/Project.pm
 | 
5
+++--
M
SCV/Viewer.pm
 | 
6
+++---
M
lib/runtime.c
 | 
2
+-

3 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/SCV/Project.pm b/SCV/Project.pm
@@ -7,7 +7,7 @@ use Test;
 use IPC::Open3;
 
 sub new {
-	my ($class, $tmp_dir) = @_;
+	my ($class) = @_;
 	my $self = {};
 	bless ($self, $class);
 
@@ -59,7 +59,6 @@ EOF
 	# Link in the runtime
 	$ENV{CFLAGS} = "-pthread -I$cwd";
 	$ENV{LDLIBS} = "-L$cwd/lib -lscv -pthread";
-	$ENV{LD_LIBRARY_PATH} = "lib";
 
 	my $ret = system( "make -C $tmp_dir" );
 	die "make failed: $ret\n" if ($ret);
@@ -80,6 +79,8 @@ sub instrumented_src {
 sub run {
 	my ($self, @args) = @_;
 
+	$ENV{LD_LIBRARY_PATH} = "lib";
+
 	my $tmp_dir = $self->{tmp_dir};
 	$self->{pid} = open3(undef, undef, \*CHLD_ERR, "$tmp_dir/program", @args);
 }
diff --git a/SCV/Viewer.pm b/SCV/Viewer.pm
@@ -5,13 +5,13 @@ use IO::Socket::UNIX;
 use Test;
 
 sub new {
-	my ($class, $tmp_dir) = @_;
+	my ($class) = @_;
 	my $self = {};
 	bless ($self, $class);
 
 	my $viewer_socket = IO::Socket::UNIX->new(
 		Type => SOCK_STREAM(),
-		Local => "/tmp/viewer_test.socket",
+		Local => "viewer_test.socket",
 		Listen => 1,
 	);
 	die "socket error: $!\n" unless ($viewer_socket);
@@ -79,7 +79,7 @@ sub DESTROY {
 	my ($self) = @_;
 
 	close($self->{viewer_socket});
-	unlink "/tmp/viewer_test.socket";
+	unlink "viewer_test.socket";
 }
 
 1;
diff --git a/lib/runtime.c b/lib/runtime.c
@@ -26,7 +26,7 @@ control_thread(void *arg)
 	struct sockaddr_un addr;
 	memset(&addr, 0, sizeof(addr));
 	addr.sun_family = AF_UNIX;
-	strncpy(addr.sun_path, "/tmp/viewer_test.socket", sizeof(addr.sun_path) - 1);
+	strncpy(addr.sun_path, "viewer_test.socket", sizeof(addr.sun_path) - 1);
 
 	if (connect(fd, (struct sockaddr *)&addr, sizeof(addr))) {
 		err(1, "connect");