commit 88337da8ae1573ccffe63f7b216695f4bfe9ceaf
parent ca0a4f1e3de84fe4862bfb91856c1c31e0b2b3c1
Author: kyle <kyle@0x30.net>
Date: Sun, 29 Jan 2017 10:34:34 -0700
t: fix up binary locations after move
Diffstat:
39 files changed, 69 insertions(+), 41 deletions(-)
diff --git a/t/check_baddir.t b/t/check_baddir.t
@@ -3,19 +3,21 @@
#
use strict;
use warnings;
+
use Test::Cmd;
use Test::More;
plan skip_all => 'not impl on win32' if ($^O eq "MSWin32");
plan tests => 3;
+
my $output_good = "Summary:
0 Source files used as input
";
my $error_good = "find: _nonexistent_: No such file or directory
";
-my $check = Test::Cmd->new( prog => 'citrun_check', workdir => '' );
+my $check = Test::Cmd->new( prog => 'bin/citrun_check', workdir => '' );
$check->run( args => '_nonexistent_', chdir => $check->curdir );
is( $check->stdout, $output_good, 'is citrun_check stdout identical' );
diff --git a/t/check_empty.t b/t/check_empty.t
@@ -10,11 +10,12 @@ use Test::More;
plan skip_all => 'not impl' if ($^O eq "MSWin32");
plan tests => 3;
+
my $output_good = "Summary:
0 Source files used as input
";
-my $check = Test::Cmd->new( prog => 'citrun_check', workdir => '' );
+my $check = Test::Cmd->new( prog => 'bin/citrun_check', workdir => '' );
$check->run( chdir => $check->curdir );
is( $check->stdout, $output_good, 'is citrun_check stdout identical' );
diff --git a/t/check_spaces.t b/t/check_spaces.t
@@ -3,17 +3,19 @@
#
use strict;
use warnings;
+
use Test::Cmd;
use Test::More;
plan skip_all => 'not impl on win32' if ($^O eq "MSWin32");
plan tests => 3;
+
my $output_good = "Summary:
0 Source files used as input
";
-my $check = Test::Cmd->new( prog => 'citrun_check', workdir => '' );
+my $check = Test::Cmd->new( prog => 'bin/citrun_check', workdir => '' );
mkdir File::Spec->catdir( $check->workdir, 'dir a' );
mkdir File::Spec->catdir( $check->workdir, 'dir b' );
diff --git a/t/e2e_ansi.t b/t/e2e_ansi.t
@@ -4,11 +4,12 @@
#
use strict;
use warnings;
+
use t::utils;
plan tests => 3;
-my $cc = Test::Cmd->new( prog => 'citrun_wrap', workdir => '' );
+my $cc = Test::Cmd->new( prog => 'bin/citrun_wrap', workdir => '' );
$cc->write( 'main.c', 'int main(void) { return 0; }' );
if ($^O eq 'MSWin32') {
diff --git a/t/e2e_fail.t b/t/e2e_fail.t
@@ -8,7 +8,7 @@ use t::utils;
plan tests => 3;
-my $inst = Test::Cmd->new( prog => 'citrun_wrap', workdir => '' );
+my $inst = Test::Cmd->new( prog => 'bin/citrun_wrap', workdir => '' );
$inst->write( 'bad.c', <<EOF );
int
diff --git a/t/e2e_intent.t b/t/e2e_intent.t
@@ -9,7 +9,7 @@ use t::utils;
plan tests => 11;
-my $e2e = Test::Cmd->new( prog => 'citrun_wrap', workdir => '' );
+my $e2e = Test::Cmd->new( prog => 'bin/citrun_wrap', workdir => '' );
$e2e->write( 'fib.c', <<EOF );
#include <stdio.h>
diff --git a/t/e2e_link_multiple.t b/t/e2e_link_multiple.t
@@ -3,11 +3,12 @@
#
use strict;
use warnings;
+
use t::utils;
plan tests => 3;
-my $wrap = Test::Cmd->new( prog => 'citrun_wrap', workdir => '' );
+my $wrap = Test::Cmd->new( prog => 'bin/citrun_wrap', workdir => '' );
$wrap->write( 'one.c', <<EOF );
void second_func();
diff --git a/t/e2e_nosrc.t b/t/e2e_nosrc.t
@@ -9,7 +9,7 @@ use t::utils;
plan tests => 4;
-my $inst = Test::Cmd->new( prog => 'citrun_wrap', workdir => '' );
+my $inst = Test::Cmd->new( prog => 'bin/citrun_wrap', workdir => '' );
my $out_good = <<EOF;
>> citrun_inst
diff --git a/t/inst_basic_link.t b/t/inst_basic_link.t
@@ -3,11 +3,12 @@
#
use strict;
use warnings;
+
use t::utils;
plan tests => 3;
-my $wrap = Test::Cmd->new( prog => 'citrun_wrap', workdir => '' );
+my $wrap = Test::Cmd->new( prog => 'bin/citrun_wrap', workdir => '' );
$wrap->write( 'main.c', 'int main(void) { return 0; }' );
$wrap->run( args => os_compiler() . 'main main.c', chdir => $wrap->curdir );
diff --git a/t/inst_binop.t b/t/inst_binop.t
@@ -3,11 +3,12 @@
#
use strict;
use warnings;
+
use t::utils;
plan tests => 4;
-my $inst = Test::Cmd->new( prog => 'citrun_inst', workdir => '' );
+my $inst = Test::Cmd->new( prog => 'bin/citrun_inst', workdir => '' );
$inst->write( 'binop.c', <<EOF );
enum ASDF {
ONE = (1 << 0),
diff --git a/t/inst_dowhile.t b/t/inst_dowhile.t
@@ -3,11 +3,12 @@
#
use strict;
use warnings;
+
use t::utils;
plan tests => 4;
-my $inst = Test::Cmd->new( prog => 'citrun_inst', workdir => '' );
+my $inst = Test::Cmd->new( prog => 'bin/citrun_inst', workdir => '' );
$inst->write( 'dowhile.c', <<EOF );
int main(int argc, char *argv[]) {
do {
diff --git a/t/inst_fail.t b/t/inst_fail.t
@@ -8,7 +8,7 @@ use t::utils;
plan tests => 2;
-my $inst = Test::Cmd->new( prog => 'citrun_inst', workdir => '' );
+my $inst = Test::Cmd->new( prog => 'bin/citrun_inst', workdir => '' );
$inst->write( 'bad.c', <<EOF );
int
diff --git a/t/inst_for.t b/t/inst_for.t
@@ -3,11 +3,12 @@
#
use strict;
use warnings;
+
use t::utils;
plan tests => 4;
-my $inst = Test::Cmd->new( prog => 'citrun_inst', workdir => '' );
+my $inst = Test::Cmd->new( prog => 'bin/citrun_inst', workdir => '' );
$inst->write( 'for.c', <<EOF );
int main(int argc, char *argv[]) {
for (;;);
diff --git a/t/inst_funcdef.t b/t/inst_funcdef.t
@@ -3,11 +3,12 @@
#
use strict;
use warnings;
+
use t::utils;
plan tests => 4;
-my $inst = Test::Cmd->new( prog => 'citrun_inst', workdir => '' );
+my $inst = Test::Cmd->new( prog => 'bin/citrun_inst', workdir => '' );
$inst->write( 'funcdef.c', <<EOF );
void
diff --git a/t/inst_if.t b/t/inst_if.t
@@ -3,11 +3,12 @@
#
use strict;
use warnings;
+
use t::utils;
plan tests => 4;
-my $inst = Test::Cmd->new( prog => 'citrun_inst', workdir => '' );
+my $inst = Test::Cmd->new( prog => 'bin/citrun_inst', workdir => '' );
$inst->write( 'if.c', <<EOF );
int main(int argc, char *argv[]) {
if (argc == 1)
diff --git a/t/inst_log.t b/t/inst_log.t
@@ -9,7 +9,7 @@ use t::utils;
plan tests => 3;
-my $wrap = Test::Cmd->new( prog => 'citrun_wrap', workdir => '' );
+my $wrap = Test::Cmd->new( prog => 'bin/citrun_wrap', workdir => '' );
$wrap->write( 'main.c', <<EOF );
#include <stdlib.h>
diff --git a/t/inst_logeol.t b/t/inst_logeol.t
@@ -8,7 +8,7 @@ use t::utils;
plan tests => 1;
-my $wrap = Test::Cmd->new( prog => 'citrun_wrap', workdir => '' );
+my $wrap = Test::Cmd->new( prog => 'bin/citrun_wrap', workdir => '' );
$wrap->write( 'main.c', <<EOF );
EOF
diff --git a/t/inst_macro.t b/t/inst_macro.t
@@ -4,11 +4,12 @@
#
use strict;
use warnings;
+
use t::utils;
plan tests => 4;
-my $inst = Test::Cmd->new( prog => 'citrun_inst', workdir => '' );
+my $inst = Test::Cmd->new( prog => 'bin/citrun_inst', workdir => '' );
$inst->write( 'macro.c', <<EOF );
#define MAYBE 1023;
diff --git a/t/inst_millis.t b/t/inst_millis.t
@@ -9,7 +9,7 @@ use t::utils;
plan tests => 3;
-my $inst = Test::Cmd->new( prog => 'citrun_inst', workdir => '' );
+my $inst = Test::Cmd->new( prog => 'bin/citrun_inst', workdir => '' );
$inst->write( 'main.c', <<EOF );
int main(void)
diff --git a/t/inst_nosrc.t b/t/inst_nosrc.t
@@ -8,7 +8,7 @@ use t::utils;
plan tests => 2;
-my $inst = Test::Cmd->new( prog => 'citrun_inst', workdir => '' );
+my $inst = Test::Cmd->new( prog => 'bin/citrun_inst', workdir => '' );
my $out_good = <<EOF;
>> citrun_inst
diff --git a/t/inst_path.t b/t/inst_path.t
@@ -10,12 +10,12 @@ use t::utils;
plan tests => 4;
-my $compiler = 'compilers/cc';
+my $compiler = 'share/citrun/cc';
$compiler = 'compilers\cl' if ($^O eq 'MSWin32');
my $cc = Test::Cmd->new( prog => $compiler, workdir => '' );
-my $error_good = "Error: '.*compilers' not in PATH.";
+my $error_good = "Error: '.*share/citrun' not in PATH.";
$cc->run( args => '', chdir => $cc->curdir );
is( $cc->stdout, '', 'is cc stdout empty' );
diff --git a/t/inst_preamble.t b/t/inst_preamble.t
@@ -3,11 +3,12 @@
#
use strict;
use warnings;
+
use t::utils;
plan tests => 3;
-my $inst = Test::Cmd->new( prog => 'citrun_inst', workdir => '' );
+my $inst = Test::Cmd->new( prog => 'bin/citrun_inst', workdir => '' );
$inst->write( "empty.c", "" );
$inst->run( args => "-c empty.c", chdir => $inst->curdir );
diff --git a/t/inst_preprocess.t b/t/inst_preprocess.t
@@ -3,12 +3,14 @@
#
use strict;
use warnings;
+
use t::utils;
plan tests => 8;
+
my $preproc = 'int main(void) { return 0; }';
-my $inst = Test::Cmd->new( prog => 'citrun_inst', workdir => '' );
+my $inst = Test::Cmd->new( prog => 'bin/citrun_inst', workdir => '' );
$inst->write( 'prepro.c', $preproc );
# Test -E
diff --git a/t/inst_return.t b/t/inst_return.t
@@ -3,11 +3,12 @@
#
use strict;
use warnings;
+
use t::utils;
plan tests => 4;
-my $inst = Test::Cmd->new( prog => 'citrun_inst', workdir => '' );
+my $inst = Test::Cmd->new( prog => 'bin/citrun_inst', workdir => '' );
$inst->write( 'return.c', <<EOF );
int foo() {
return 0;
diff --git a/t/inst_srcext.t b/t/inst_srcext.t
@@ -3,13 +3,14 @@
#
use strict;
use warnings;
+
use t::utils;
plan tests => 15;
my @supported_exts = ("c", "cc", "cxx", "cpp");
-my $inst = Test::Cmd->new( prog => 'citrun_inst', workdir => '' );
+my $inst = Test::Cmd->new( prog => 'bin/citrun_inst', workdir => '' );
my $out_good = <<EOF;
>> citrun_inst
diff --git a/t/inst_switch.t b/t/inst_switch.t
@@ -3,11 +3,12 @@
#
use strict;
use warnings;
+
use t::utils;
plan tests => 4;
-my $inst = Test::Cmd->new( prog => 'citrun_inst', workdir => '' );
+my $inst = Test::Cmd->new( prog => 'bin/citrun_inst', workdir => '' );
$inst->write( 'switch.c', <<EOF );
int main(void)
{
diff --git a/t/inst_two_src.t b/t/inst_two_src.t
@@ -4,11 +4,12 @@
#
use strict;
use warnings;
+
use t::utils;
plan tests => 3;
-my $wrap = Test::Cmd->new( prog => 'citrun_wrap', workdir => '' );
+my $wrap = Test::Cmd->new( prog => 'bin/citrun_wrap', workdir => '' );
$wrap->write( 'main.c', 'int main(void) { return 0; }' );
$wrap->write( 'other.c', <<EOF );
diff --git a/t/inst_while.t b/t/inst_while.t
@@ -3,11 +3,12 @@
#
use strict;
use warnings;
+
use t::utils;
plan tests => 4;
-my $inst = Test::Cmd->new( prog => 'citrun_inst', workdir => '' );
+my $inst = Test::Cmd->new( prog => 'bin/citrun_inst', workdir => '' );
$inst->write( 'while.c', <<EOF );
int main(int argc, char *argv[]) {
while (argc < 17)
diff --git a/t/lib_badver.t b/t/lib_badver.t
@@ -9,7 +9,7 @@ use t::utils; # os_compiler()
plan tests => 4;
-my $compiler = Test::Cmd->new( prog => 'citrun_wrap', workdir => '' );
+my $compiler = Test::Cmd->new( prog => 'bin/citrun_wrap', workdir => '' );
$compiler->write( 'main.c', <<EOF );
#include <stddef.h>
diff --git a/t/mem.pm b/t/mem.pm
@@ -75,7 +75,7 @@ sub get_buffers {
1;
__DATA__
__C__
-#include "../lib.h"
+#include "../lib/lib.h"
size_t citrun_header_size() {
return sizeof(struct citrun_header);
diff --git a/t/utils.pm b/t/utils.pm
@@ -39,7 +39,7 @@ sub get_one_shmfile {
sub setup_projdir {
- my $wrap = Test::Cmd->new( prog => 'citrun_wrap', workdir => '' );
+ my $wrap = Test::Cmd->new( prog => 'bin/citrun_wrap', workdir => '' );
$ENV{CITRUN_PROCDIR} = $wrap->workdir;
$wrap->write( 'main.c', <<EOF);
diff --git a/t/wrap_badarg.t b/t/wrap_badarg.t
@@ -3,10 +3,12 @@
#
use strict;
use warnings;
+
use Test::Cmd;
use Test::More tests => 3;
-my $wrap = Test::Cmd->new( prog => 'citrun_wrap', workdir => '' );
+
+my $wrap = Test::Cmd->new( prog => 'bin/citrun_wrap', workdir => '' );
$wrap->run( args => '-ASD', chdir => $wrap->curdir );
my $err_good;
diff --git a/t/wrap_cmake.t b/t/wrap_cmake.t
@@ -11,7 +11,7 @@ plan skip_all => 'cmake not found' unless (which 'cmake');
plan tests => 8;
-my $wrap = Test::Cmd->new( prog => 'citrun_wrap', workdir => '' );
+my $wrap = Test::Cmd->new( prog => 'bin/citrun_wrap', workdir => '' );
$wrap->write( 'CMakeLists.txt', <<'EOF' );
cmake_minimum_required (VERSION 2.6)
diff --git a/t/wrap_exitcode.t b/t/wrap_exitcode.t
@@ -3,10 +3,12 @@
#
use strict;
use warnings;
+
use Test::Cmd;
use Test::More tests => 3;
-my $wrap = Test::Cmd->new( prog => 'citrun_wrap', workdir => '' );
+
+my $wrap = Test::Cmd->new( prog => 'bin/citrun_wrap', workdir => '' );
my $err_good;
if ($^O eq "MSWin32") {
diff --git a/t/wrap_jam.t b/t/wrap_jam.t
@@ -11,7 +11,7 @@ plan skip_all => 'jam not found' unless (which 'jam');
plan tests => 6;
-my $wrap = Test::Cmd->new( prog => 'citrun_wrap', workdir => '' );
+my $wrap = Test::Cmd->new( prog => 'bin/citrun_wrap', workdir => '' );
$wrap->write( 'main.c', 'int main(void) { return 0; }' );
$wrap->write( 'Jamfile', <<EOF );
diff --git a/t/wrap_make.t b/t/wrap_make.t
@@ -11,7 +11,7 @@ plan skip_all => 'make not found' unless (which 'make');
plan tests => 6;
-my $wrap = Test::Cmd->new( prog => 'citrun_wrap', workdir => '' );
+my $wrap = Test::Cmd->new( prog => 'bin/citrun_wrap', workdir => '' );
$wrap->write( 'main.c', 'int main(void) { return 0; }' );
$wrap->write( 'Makefile', <<'EOF' );
diff --git a/t/wrap_ninja.t b/t/wrap_ninja.t
@@ -11,7 +11,7 @@ plan skip_all => 'ninja not found' unless (which 'ninja');
plan tests => 6;
-my $wrap = Test::Cmd->new( prog => 'citrun_wrap', workdir => '' );
+my $wrap = Test::Cmd->new( prog => 'bin/citrun_wrap', workdir => '' );
$wrap->write( 'main.c', 'int main(void) { return 0; }' );
$wrap->write( 'build.ninja', <<'EOF' );
diff --git a/t/wrap_nmake.t b/t/wrap_nmake.t
@@ -1,11 +1,13 @@
use strict;
use warnings;
+
use t::utils;
plan skip_all => 'win32 only' if ($^O ne "MSWin32");
plan tests => 6;
-my $wrap = Test::Cmd->new( prog => 'citrun_wrap', workdir => '' );
+
+my $wrap = Test::Cmd->new( prog => 'bin/citrun_wrap', workdir => '' );
$wrap->write( 'main.c', 'int main(void) { return 0; }' );
$wrap->write( 'Makefile', <<EOF );
diff --git a/t/wrap_parallel.t b/t/wrap_parallel.t
@@ -12,7 +12,7 @@ plan skip_all => 'make not found' unless (which 'make');
plan tests => 15;
-my $wrap = Test::Cmd->new( prog => 'citrun_wrap', workdir => '' );
+my $wrap = Test::Cmd->new( prog => 'bin/citrun_wrap', workdir => '' );
$wrap->write( 'main1.c', 'int main(void) { return 0; }' );
$wrap->write( 'main2.c', 'int main(void) { return 0; }' );
@@ -49,7 +49,7 @@ Totals:
12 Total statements
EOF
-$wrap->run( prog => 'citrun_check', chdir => $wrap->curdir );
+$wrap->run( prog => 'bin/citrun_check', chdir => $wrap->curdir );
my $check_out = $wrap->stdout;
$check_out =~ s/^.*Milliseconds spent rewriting.*\n//gm;
eq_or_diff( $check_out, $check_good, 'is citrun_check stdout identical', { context => 3 } );
