citrun

commit 5e931af38c325cc811c6082c957e8bdcb1e78878
parent d119e2a29b940e55f3cefd9d3302952bdf023c31
Author: Kyle Milz <kyle@0x30.net>
Date:   Tue, 14 Jun 2016 21:35:48 -0600

e2e/vim: update comments and package fetching

Diffstat:
M
e2e/vim.t
 | 
23
+++++++++++------------

1 file changed, 11 insertions(+), 12 deletions(-)
diff --git a/e2e/vim.t b/e2e/vim.t
@@ -11,38 +11,37 @@ use Time::HiRes qw( time );
 
 use Test::Viewer;
 
+# Build and test Vim with citrun.
 #
-# This uses tools installed from a package, not the in tree build!
-#
-
-# XXX: check that citrun is installed in OS independent way
 
-#
 # Download source, extract, configure and compile
 #
 my $tmpdir = tempdir( CLEANUP => 1 );
-my $vim_src = "ftp://ftp.vim.org/pub/vim/unix/vim-7.4.tar.bz2";
-system("cd $tmpdir && curl -O $vim_src") == 0 or die "download failed";
-system("cd $tmpdir && tar xjf vim-7.4.tar.bz2") == 0 or die "extract failed";
+
+my $vim_src = "vim-7.4.tar.bz2";
+my $vim_url = "ftp://ftp.vim.org/pub/vim/unix/$vim_src";
+
+system("cd $tmpdir && curl -O $vim_url") == 0 or die "download failed";
+system("cd $tmpdir && tar xjf $vim_src") == 0 or die "extract failed";
 
 my $srcdir = "$tmpdir/vim74/src";
 system("citrun-wrap make -C $srcdir config") == 0 or die "citrun-wrap make config failed";
 
 # Remove last instrumented node from configure run
-system("rm $srcdir/LAST_NODE");
+system("rm $srcdir/INSTRUMENTED");
+
 system("citrun-wrap make -C $srcdir -j8 myself") == 0 or die "citrun-wrap make failed";
 
-#
 # Check that the native test suite can pass, validating that the instrumentation
 # hasn't broken the intent of the program.
 #
 my $exp = Expect->spawn("make", "-C", "$srcdir/testdir");
 $exp->expect(undef, ("ALL DONE"));
+
 # Unfuck the terminal after the testsuite is done
 system("resize");
 
-#
-# Make sure the instrumentation for Vim is working correctly
+# Make sure the instrumentation for vim and xxd is working correctly
 #
 my $viewer = Test::Viewer->new();
 $ENV{CITRUN_SOCKET} = getcwd . "/citrun-test.socket";