commit 6389a280513180a6c029790d3299f2f56d8fde45
parent c59b83f13f6620b6864407953e4c84dca8b2140e
Author: Kyle Milz <milz@imac.0x30.net>
Date: Wed, 3 Mar 2021 20:44:56 -0800
t: cope with citrun_inst move
Diffstat:
17 files changed, 20 insertions(+), 26 deletions(-)
diff --git a/t/inst_binop.t b/t/inst_binop.t
@@ -7,7 +7,7 @@ use t::utils;
plan tests => 4;
-my $inst = Test::Cmd->new( prog => 'bin/citrun_inst', workdir => '' );
+my $inst = Test::Cmd->new( prog => 'inst/citrun_inst', workdir => '' );
$inst->write( 'binop.c', <<EOF );
enum ASDF {
diff --git a/t/inst_dowhile.t b/t/inst_dowhile.t
@@ -6,7 +6,7 @@ use t::utils;
plan tests => 4;
-my $inst = Test::Cmd->new( prog => 'bin/citrun_inst', workdir => '' );
+my $inst = Test::Cmd->new( prog => 'inst/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
@@ -6,7 +6,7 @@ use t::utils;
plan tests => 2;
-my $inst = Test::Cmd->new( prog => 'bin/citrun_inst', workdir => '' );
+my $inst = Test::Cmd->new( prog => 'inst/citrun_inst', workdir => '' );
$inst->write( 'bad.c', <<EOF );
int
diff --git a/t/inst_for.t b/t/inst_for.t
@@ -6,7 +6,7 @@ use t::utils;
plan tests => 4;
-my $inst = Test::Cmd->new( prog => 'bin/citrun_inst', workdir => '' );
+my $inst = Test::Cmd->new( prog => 'inst/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
@@ -6,7 +6,7 @@ use t::utils;
plan tests => 4;
-my $inst = Test::Cmd->new( prog => 'bin/citrun_inst', workdir => '' );
+my $inst = Test::Cmd->new( prog => 'inst/citrun_inst', workdir => '' );
$inst->write( 'funcdef.c', <<EOF );
void
diff --git a/t/inst_if.t b/t/inst_if.t
@@ -6,7 +6,7 @@ use t::utils;
plan tests => 4;
-my $inst = Test::Cmd->new( prog => 'bin/citrun_inst', workdir => '' );
+my $inst = Test::Cmd->new( prog => 'inst/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
@@ -33,8 +33,8 @@ main(int argc, char *argv[])
}
EOF
-$wrap->write( 'Jamfile', 'Main main : main.c ;' );
-$wrap->run( args => 'jam', chdir => $wrap->curdir );
+$wrap->write( 'Makefile', 'main: main.o' );
+$wrap->run( args => 'make', chdir => $wrap->curdir );
my $citrun_log_good =<<EOF ;
>> citrun_inst
@@ -55,12 +55,6 @@ Modified source written successfully.
Forked compiler ''
Rewritten source compile successful
Restored ''
->> citrun_inst
-Compilers path = ''
-PATH = ''
-Link detected, adding '' to command line.
-Command line is ''
-No source files found on command line.
EOF
my $citrun_log;
diff --git a/t/inst_macro.t b/t/inst_macro.t
@@ -7,7 +7,7 @@ use t::utils;
plan tests => 4;
-my $inst = Test::Cmd->new( prog => 'bin/citrun_inst', workdir => '' );
+my $inst = Test::Cmd->new( prog => 'inst/citrun_inst', workdir => '' );
$inst->write( 'macro.c', <<EOF );
#define MAYBE 1023;
diff --git a/t/inst_millis.t b/t/inst_millis.t
@@ -7,7 +7,7 @@ use t::utils;
plan tests => 3;
-my $inst = Test::Cmd->new( prog => 'bin/citrun_inst', workdir => '' );
+my $inst = Test::Cmd->new( prog => 'inst/citrun_inst', workdir => '' );
$inst->write( 'main.c', <<EOF );
int main(void)
diff --git a/t/inst_nosrc.t b/t/inst_nosrc.t
@@ -6,7 +6,7 @@ use t::utils;
plan tests => 2;
-my $inst = Test::Cmd->new( prog => 'bin/citrun_inst', workdir => '' );
+my $inst = Test::Cmd->new( prog => 'inst/citrun_inst', workdir => '' );
my $out_good = <<EOF;
>> citrun_inst
diff --git a/t/inst_path.t b/t/inst_path.t
@@ -9,12 +9,12 @@ use t::utils;
plan tests => 4;
-my $compiler = 'share/citrun/cc';
+my $compiler = 'share/cc';
$compiler = 'compilers\cl' if ($^O eq 'MSWin32');
my $cc = Test::Cmd->new( prog => $compiler, workdir => '' );
-my $error_good = "Error: '.*share/citrun' not in PATH.";
+my $error_good = "Error: '.*share' 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
@@ -6,7 +6,7 @@ use t::utils;
plan tests => 3;
-my $inst = Test::Cmd->new( prog => 'bin/citrun_inst', workdir => '' );
+my $inst = Test::Cmd->new( prog => 'inst/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
@@ -8,7 +8,7 @@ plan tests => 8;
my $preproc = 'int main(void) { return 0; }';
-my $inst = Test::Cmd->new( prog => 'bin/citrun_inst', workdir => '' );
+my $inst = Test::Cmd->new( prog => 'inst/citrun_inst', workdir => '' );
$inst->write( 'prepro.c', $preproc );
# Test -E
diff --git a/t/inst_return.t b/t/inst_return.t
@@ -6,7 +6,7 @@ use t::utils;
plan tests => 4;
-my $inst = Test::Cmd->new( prog => 'bin/citrun_inst', workdir => '' );
+my $inst = Test::Cmd->new( prog => 'inst/citrun_inst', workdir => '' );
$inst->write( 'return.c', <<EOF );
int foo() {
return 0;
diff --git a/t/inst_srcext.t b/t/inst_srcext.t
@@ -8,7 +8,7 @@ plan tests => 15;
my @supported_exts = ("c", "cc", "cxx", "cpp");
-my $inst = Test::Cmd->new( prog => 'bin/citrun_inst', workdir => '' );
+my $inst = Test::Cmd->new( prog => 'inst/citrun_inst', workdir => '' );
my $out_good = <<EOF;
>> citrun_inst
diff --git a/t/inst_switch.t b/t/inst_switch.t
@@ -6,7 +6,7 @@ use t::utils;
plan tests => 4;
-my $inst = Test::Cmd->new( prog => 'bin/citrun_inst', workdir => '' );
+my $inst = Test::Cmd->new( prog => 'inst/citrun_inst', workdir => '' );
$inst->write( 'switch.c', <<EOF );
int main(void)
{
@@ -51,7 +51,7 @@ Instrumentation of '' finished:
1 Function definitions
1 Switch statements
1 Return statement values
- 14 Total statements
+ 16 Total statements
Modified source written successfully.
EOF
diff --git a/t/inst_while.t b/t/inst_while.t
@@ -6,7 +6,7 @@ use t::utils;
plan tests => 4;
-my $inst = Test::Cmd->new( prog => 'bin/citrun_inst', workdir => '' );
+my $inst = Test::Cmd->new( prog => 'inst/citrun_inst', workdir => '' );
$inst->write( 'while.c', <<EOF );
int main(int argc, char *argv[]) {
while (argc < 17)
