commit 681ca38574b6cf2d79d070b741ba3a933bd623a0
parent 378f04a79287ac74ee159ed8b896e5db76894120
Author: Kyle Milz <kyle@getaddrinfo.net>
Date: Fri, 25 Mar 2016 14:18:53 -0600
t: stop comparing preamble in many tests
Diffstat:
8 files changed, 4 insertions(+), 134 deletions(-)
diff --git a/SCV/Project.pm b/SCV/Project.pm
@@ -57,11 +57,14 @@ sub instrumented_src {
my ($self) = @_;
open( my $inst_fh, "<", "$self->{tmp_dir}/inst/source_0.c" );
+
+ # Knock off the instrumentation preamble
+ my $line = <$inst_fh> for (1..19);
+
my $inst_src;
while (my $line = <$inst_fh>) {
$inst_src .= $line;
}
-
return $inst_src;
}
diff --git a/t/fibonacci.t b/t/fibonacci.t
@@ -48,25 +48,6 @@ $project->compile();
my $tmp_dir = $project->get_tmpdir();
my $inst_src_good = <<EOF;
-#include <stdint.h>
-struct _scv_node {
- uint64_t *lines_ptr;
- uint32_t size;
- uint32_t inst_sites;
- const char *file_name;
- struct _scv_node *next;
-};
-void libscv_init();
-
-static uint64_t _scv_lines[31];
-struct _scv_node _scv_node1;
-struct _scv_node _scv_node0 = {
- .lines_ptr = _scv_lines,
- .size = 31,
- .inst_sites = 19,
- .file_name = "$tmp_dir/source_0.c",
- .next = &_scv_node1,
-};
#include <stdio.h>
#include <stdlib.h>
diff --git a/t/for.t b/t/for.t
@@ -29,25 +29,6 @@ $project->compile();
my $tmp_dir = $project->get_tmpdir();
my $inst_src_good = <<EOF;
-#include <stdint.h>
-struct _scv_node {
- uint64_t *lines_ptr;
- uint32_t size;
- uint32_t inst_sites;
- const char *file_name;
- struct _scv_node *next;
-};
-void libscv_init();
-
-static uint64_t _scv_lines[12];
-struct _scv_node _scv_node1;
-struct _scv_node _scv_node0 = {
- .lines_ptr = _scv_lines,
- .size = 12,
- .inst_sites = 2,
- .file_name = "$tmp_dir/source_0.c",
- .next = &_scv_node1,
-};
int
main(void)
{libscv_init();
diff --git a/t/hello_world.t b/t/hello_world.t
@@ -26,25 +26,6 @@ $project->compile();
my $tmp_dir = $project->get_tmpdir();
my $inst_src_good = <<EOF;
-#include <stdint.h>
-struct _scv_node {
- uint64_t *lines_ptr;
- uint32_t size;
- uint32_t inst_sites;
- const char *file_name;
- struct _scv_node *next;
-};
-void libscv_init();
-
-static uint64_t _scv_lines[9];
-struct _scv_node _scv_node1;
-struct _scv_node _scv_node0 = {
- .lines_ptr = _scv_lines,
- .size = 9,
- .inst_sites = 7,
- .file_name = "$tmp_dir/source_0.c",
- .next = &_scv_node1,
-};
#include <stdio.h>
int
diff --git a/t/if.t b/t/if.t
@@ -36,25 +36,6 @@ $project->compile();
my $tmp_dir = $project->get_tmpdir();
my $inst_src_good = <<EOF;
-#include <stdint.h>
-struct _scv_node {
- uint64_t *lines_ptr;
- uint32_t size;
- uint32_t inst_sites;
- const char *file_name;
- struct _scv_node *next;
-};
-void libscv_init();
-
-static uint64_t _scv_lines[21];
-struct _scv_node _scv_node1;
-struct _scv_node _scv_node0 = {
- .lines_ptr = _scv_lines,
- .size = 21,
- .inst_sites = 9,
- .file_name = "$tmp_dir/source_0.c",
- .next = &_scv_node1,
-};
#include <stdlib.h>
int
diff --git a/t/return.t b/t/return.t
@@ -29,25 +29,6 @@ $project->compile();
my $tmp_dir = $project->get_tmpdir();
my $inst_src_good = <<EOF;
-#include <stdint.h>
-struct _scv_node {
- uint64_t *lines_ptr;
- uint32_t size;
- uint32_t inst_sites;
- const char *file_name;
- struct _scv_node *next;
-};
-void libscv_init();
-
-static uint64_t _scv_lines[12];
-struct _scv_node _scv_node1;
-struct _scv_node _scv_node0 = {
- .lines_ptr = _scv_lines,
- .size = 12,
- .inst_sites = 5,
- .file_name = "$tmp_dir/source_0.c",
- .next = &_scv_node1,
-};
int foo() {
return (++_scv_lines[2], 0);
}
diff --git a/t/switch.t b/t/switch.t
@@ -32,25 +32,6 @@ $project->compile();
my $tmp_dir = $project->get_tmpdir();
my $inst_src_good = <<EOF;
-#include <stdint.h>
-struct _scv_node {
- uint64_t *lines_ptr;
- uint32_t size;
- uint32_t inst_sites;
- const char *file_name;
- struct _scv_node *next;
-};
-void libscv_init();
-
-static uint64_t _scv_lines[15];
-struct _scv_node _scv_node1;
-struct _scv_node _scv_node0 = {
- .lines_ptr = _scv_lines,
- .size = 15,
- .inst_sites = 2,
- .file_name = "$tmp_dir/source_0.c",
- .next = &_scv_node1,
-};
int
main(void)
{libscv_init();
diff --git a/t/while.t b/t/while.t
@@ -30,25 +30,6 @@ $project->compile();
my $tmp_dir = $project->get_tmpdir();
my $inst_src_good = <<EOF;
-#include <stdint.h>
-struct _scv_node {
- uint64_t *lines_ptr;
- uint32_t size;
- uint32_t inst_sites;
- const char *file_name;
- struct _scv_node *next;
-};
-void libscv_init();
-
-static uint64_t _scv_lines[13];
-struct _scv_node _scv_node1;
-struct _scv_node _scv_node0 = {
- .lines_ptr = _scv_lines,
- .size = 13,
- .inst_sites = 2,
- .file_name = "$tmp_dir/source_0.c",
- .next = &_scv_node1,
-};
int
main(void)
{libscv_init();
