citrun

watch C/C++ source code execute
Log | Files | Refs | LICENSE

commit 7e00e1afdcdfc15522211e513a3f42c1a31a6fbf
parent 3beac6a2e2ad01040cf27bc940d9b6f2879ab12d
Author: Kyle Milz <kyle@getaddrinfo.net>
Date:   Mon, 21 Mar 2016 21:38:53 -0600

wrap: delete test wrapper

Diffstat:
MSCV/Project.pm | 4++--
Mwrap/scv_wrap | 3++-
Dwrap/scv_wrap_test | 23-----------------------
3 files changed, 4 insertions(+), 26 deletions(-)

diff --git a/SCV/Project.pm b/SCV/Project.pm @@ -49,7 +49,7 @@ EOF syswrite( $makefile_fh, $makefile ); # Use the wrapper to make sure it works - my $ret = system( "wrap/scv_wrap_test make -C $tmp_dir" ); + my $ret = system( "wrap/scv_wrap make -C $tmp_dir" ); die "make failed: $ret\n" if ($ret); } @@ -69,7 +69,7 @@ sub run { my ($self, @args) = @_; my $tmp_dir = $self->{tmp_dir}; - $self->{pid} = open3(undef, undef, \*CHLD_ERR, "wrap/scv_wrap_test", "$tmp_dir/program", @args); + $self->{pid} = open3(undef, undef, \*CHLD_ERR, "wrap/scv_wrap", "$tmp_dir/program", @args); } sub kill { diff --git a/wrap/scv_wrap b/wrap/scv_wrap @@ -1,6 +1,7 @@ #!/bin/sh -scv_root=/home/kyle/src/scv +script_dir=`dirname ${0}` +scv_root=`cd "$script_dir/.."; pwd` if ! test -d $scv_root/instrument/compilers; then echo error: compilers/ directory does not exist diff --git a/wrap/scv_wrap_test b/wrap/scv_wrap_test @@ -1,23 +0,0 @@ -#!/bin/sh - -# When running tests we always want to use the in-tree version of libraries, -# header files, instrument -CWD=`pwd` - -if ! test -d $CWD/instrument/compilers; then - echo error: compilers/ directory does not exist - exit 1 -fi - -export SCV_PATH="$CWD/instrument/compilers" -export PATH="$SCV_PATH:$PATH" - -export CFLAGS="-I$CWD/lib" -export LDFLAGS="-L$CWD/lib" - -export LDADD="-lscv" - -export LD_LIBRARY_PATH="$CWD/lib" -export DYLD_LIBRARY_PATH="$CWD/lib" - -exec $@