citrun

commit 44759110011221426b7e8a1e9e637904189b737f
parent f34aa4b9014f1a6e59df9fb23d7d08976159710e
Author: kyle <kyle@getaddrinfo.net>
Date:   Wed, 16 Mar 2016 19:49:33 -0600

lib: move and rename scv_global.h closer to runtime

Diffstat:
M
instrument/instrumenter.cxx
 | 
2
+-
R
scv_global.h -> lib/scv_runtime.h
 | 
0

M
t/fibonacci.t
 | 
2
+-
M
t/for.t
 | 
2
+-
M
t/hello_world.t
 | 
2
+-
M
t/if.t
 | 
2
+-
M
t/return.t
 | 
2
+-
M
t/switch.t
 | 
2
+-
M
t/while.t
 | 
2
+-
M
wrap/scv_wrap
 | 
4
++--

10 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/instrument/instrumenter.cxx b/instrument/instrumenter.cxx
@@ -178,7 +178,7 @@ MyFrontendAction::EndSourceFileAction()
 
 	std::stringstream ss;
 
-	ss << "#include <scv_global.h>" << std::endl;
+	ss << "#include <scv_runtime.h>" << std::endl;
 	// Define storage for coverage data
 	ss << "static uint64_t lines[" << num_lines << "];" << std::endl;
 
diff --git a/scv_global.h b/lib/scv_runtime.h
diff --git a/t/fibonacci.t b/t/fibonacci.t
@@ -53,7 +53,7 @@ $project->compile();
 my $tmp_dir = $project->get_tmpdir();
 
 my $inst_src_good = <<EOF;
-#include <scv_global.h>
+#include <scv_runtime.h>
 static uint64_t lines[36];
 struct scv_node node1;
 struct scv_node node0 = {
diff --git a/t/for.t b/t/for.t
@@ -29,7 +29,7 @@ $project->compile();
 my $tmp_dir = $project->get_tmpdir();
 
 my $inst_src_good = <<EOF;
-#include <scv_global.h>
+#include <scv_runtime.h>
 static uint64_t lines[12];
 struct scv_node node1;
 struct scv_node node0 = {
diff --git a/t/hello_world.t b/t/hello_world.t
@@ -26,7 +26,7 @@ $project->compile();
 my $tmp_dir = $project->get_tmpdir();
 
 my $inst_src_good = <<EOF;
-#include <scv_global.h>
+#include <scv_runtime.h>
 static uint64_t lines[9];
 struct scv_node node1;
 struct scv_node node0 = {
diff --git a/t/if.t b/t/if.t
@@ -36,7 +36,7 @@ $project->compile();
 my $tmp_dir = $project->get_tmpdir();
 
 my $inst_src_good = <<EOF;
-#include <scv_global.h>
+#include <scv_runtime.h>
 static uint64_t lines[21];
 struct scv_node node1;
 struct scv_node node0 = {
diff --git a/t/return.t b/t/return.t
@@ -29,7 +29,7 @@ $project->compile();
 my $tmp_dir = $project->get_tmpdir();
 
 my $inst_src_good = <<EOF;
-#include <scv_global.h>
+#include <scv_runtime.h>
 static uint64_t lines[12];
 struct scv_node node1;
 struct scv_node node0 = {
diff --git a/t/switch.t b/t/switch.t
@@ -32,7 +32,7 @@ $project->compile();
 my $tmp_dir = $project->get_tmpdir();
 
 my $inst_src_good = <<EOF;
-#include <scv_global.h>
+#include <scv_runtime.h>
 static uint64_t lines[15];
 struct scv_node node1;
 struct scv_node node0 = {
diff --git a/t/while.t b/t/while.t
@@ -30,7 +30,7 @@ $project->compile();
 my $tmp_dir = $project->get_tmpdir();
 
 my $inst_src_good = <<EOF;
-#include <scv_global.h>
+#include <scv_runtime.h>
 static uint64_t lines[13];
 struct scv_node node1;
 struct scv_node node0 = {
diff --git a/wrap/scv_wrap b/wrap/scv_wrap
@@ -10,9 +10,9 @@ fi
 export SCV_PATH="$scv_root/instrument/compilers"
 export PATH="$SCV_PATH:$PATH"
 
-export CFLAGS="-I$scv_root"
-
+export CFLAGS="-I$scv_root/lib"
 export LDFLAGS="-L$scv_root/lib"
+
 export LDADD="-lscv"
 
 # Used for running programs