commit 3d2829dc9d0f2b355ea2629a0d0d61169c82d6e3
parent ec167ed45a36a13c3686d035109c13a3bc8c376b
Author: Kyle Milz <kyle@0x30.net>
Date: Sun, 18 Dec 2016 16:20:43 -0700
t: include libtap.sh once
Diffstat:
34 files changed, 3 insertions(+), 33 deletions(-)
diff --git a/t/check_baddir.sh b/t/check_baddir.sh
@@ -2,7 +2,6 @@
#
# Verify that passing a bad directory to citrun-check errors out.
#
-. t/libtap.subr
. t/utils.subr
plan 1
diff --git a/t/check_empty.sh b/t/check_empty.sh
@@ -2,7 +2,6 @@
#
# Verify the output when 0 citrun.log files are found.
#
-. t/libtap.subr
. t/utils.subr
plan 1
diff --git a/t/check_spaces.sh b/t/check_spaces.sh
@@ -2,7 +2,6 @@
#
# Verify citrun-check can handle paths with spaces when counting log file.
#
-. t/libtap.subr
. t/utils.subr
plan 2
diff --git a/t/e2e_ansi.sh b/t/e2e_ansi.sh
@@ -3,7 +3,6 @@
# Check that instrumentation works when the -ansi flag is passed during
# compilation.
#
-. t/libtap.subr
. t/utils.subr
plan 4
diff --git a/t/e2e_basic.sh b/t/e2e_basic.sh
@@ -2,7 +2,6 @@
#
# Check that a simple program can execute successfully with instrumentation.
#
-. t/libtap.subr
. t/utils.subr
plan 7
diff --git a/t/e2e_stdout.sh b/t/e2e_stdout.sh
@@ -2,7 +2,6 @@
#
# Simple program that prints output.
#
-. t/libtap.subr
. t/utils.subr
plan 5
diff --git a/t/inst_basic_link.sh b/t/inst_basic_link.sh
@@ -2,7 +2,6 @@
#
# Check that the most basic of compile command lines works.
#
-. t/libtap.subr
. t/utils.subr
plan 4
diff --git a/t/inst_binop.sh b/t/inst_binop.sh
@@ -2,7 +2,6 @@
#
# Test that binary operators in strange cases work. Includes enums and globals.
#
-. t/libtap.subr
. t/utils.subr
plan 5
diff --git a/t/inst_dowhile.sh b/t/inst_dowhile.sh
@@ -2,7 +2,6 @@
#
# Make sure that do while loop condition instrumentation works.
#
-. t/libtap.subr
. t/utils.subr
plan 5
diff --git a/t/inst_fail.sh b/t/inst_fail.sh
@@ -2,7 +2,6 @@
#
# Check that a program that won't compile natively is handled properly.
#
-. t/libtap.subr
. t/utils.subr
plan 4
diff --git a/t/inst_for.sh b/t/inst_for.sh
@@ -2,7 +2,6 @@
#
# Test that for loop condition instrumenting works.
#
-. t/libtap.subr
. t/utils.subr
plan 5
diff --git a/t/inst_funcdef.sh b/t/inst_funcdef.sh
@@ -2,7 +2,6 @@
#
# Check that really long function declarations are instrumented properly.
#
-. t/libtap.subr
. t/utils.subr
plan 5
diff --git a/t/inst_if.sh b/t/inst_if.sh
@@ -2,7 +2,6 @@
#
# Check that if statement conditions are instrumented properly.
#
-. t/libtap.subr
. t/utils.subr
plan 5
diff --git a/t/inst_link_multiple.sh b/t/inst_link_multiple.sh
@@ -2,7 +2,6 @@
#
# Check that linking more than one instrumented object file together works.
#
-. t/libtap.subr
. t/utils.subr
plan 4
diff --git a/t/inst_log.sh b/t/inst_log.sh
@@ -3,7 +3,6 @@
# Check that a raw citrun.log file is in good shape.
# citrun-check relies on this output, and citrun-check is used quite a bit.
#
-. t/libtap.subr
. t/utils.subr
plan 3
diff --git a/t/inst_macro.sh b/t/inst_macro.sh
@@ -3,7 +3,6 @@
# Test for some tricky macro situations. In particular macro expansions at the
# end of binary operators.
#
-. t/libtap.subr
. t/utils.subr
plan 5
diff --git a/t/inst_path.sh b/t/inst_path.sh
@@ -4,7 +4,7 @@
# - not having PATH set errors
# - not having CITRUN_SHARE in PATH when using transparent compile mode errors
#
-. t/libtap.subr
+. t/utils.subr
plan 2
# We need the absolute path to this faux compiler because we're killing PATH
diff --git a/t/inst_preamble.sh b/t/inst_preamble.sh
@@ -2,7 +2,6 @@
#
# Test that the instrumentation preamble is what we think it is.
#
-. t/libtap.subr
. t/utils.subr
plan 3
diff --git a/t/inst_preprocess.sh b/t/inst_preprocess.sh
@@ -2,7 +2,6 @@
#
# Make sure preprocessor flags -E, -MM cause no instrumentation to be done.
#
-. t/libtap.subr
. t/utils.subr
plan 3
diff --git a/t/inst_return.sh b/t/inst_return.sh
@@ -2,7 +2,6 @@
#
# Check that return statement values (if any) are instrumented correctly.
#
-. t/libtap.subr
. t/utils.subr
plan 5
diff --git a/t/inst_src_ext.sh b/t/inst_src_ext.sh
@@ -2,7 +2,6 @@
#
# Check that the advertised source file extensions work.
#
-. t/libtap.subr
. t/utils.subr
plan 8
diff --git a/t/inst_switch.sh b/t/inst_switch.sh
@@ -2,7 +2,6 @@
#
# Make sure that switch statement condition instrumentation works.
#
-. t/libtap.subr
. t/utils.subr
plan 5
diff --git a/t/inst_two_src.sh b/t/inst_two_src.sh
@@ -3,7 +3,6 @@
# Check that two source files given on the same command line both get
# instrumented fully.
#
-. t/libtap.subr
. t/utils.subr
plan 4
diff --git a/t/inst_while.sh b/t/inst_while.sh
@@ -2,7 +2,6 @@
#
# Make sure that while loop condition instrumentation works.
#
-. t/libtap.subr
. t/utils.subr
plan 5
diff --git a/t/lib_badver.sh b/t/lib_badver.sh
@@ -3,7 +3,6 @@
# Check that linking object files of one citrun version with libcitrun of
# another errors.
#
-. t/libtap.subr
. t/utils.subr
plan 3
diff --git a/t/utils.subr b/t/utils.subr
@@ -1,3 +1,5 @@
+. t/libtap.subr
+
strip_preamble()
{
file="${1}"
diff --git a/t/wrap_badarg.sh b/t/wrap_badarg.sh
@@ -1,5 +1,4 @@
#!/bin/sh -u
-. t/libtap.subr
. t/utils.subr
plan 1
diff --git a/t/wrap_badsrc.sh b/t/wrap_badsrc.sh
@@ -2,7 +2,6 @@
#
# Test that compiling a non-existent file errors the parser out.
#
-. t/libtap.subr
. t/utils.subr
plan 4
diff --git a/t/wrap_cmake.sh b/t/wrap_cmake.sh
@@ -2,7 +2,6 @@
#
# Test that wrapping the 'cmake' build system produces instrumented binaries.
#
-. t/libtap.subr
. t/utils.subr
plan 7
diff --git a/t/wrap_exitcode.sh b/t/wrap_exitcode.sh
@@ -2,7 +2,6 @@
#
# Make sure that citrun-wrap exits with the same code as the native build.
#
-. t/libtap.subr
. t/utils.subr
plan 1
diff --git a/t/wrap_jam.sh b/t/wrap_jam.sh
@@ -2,7 +2,6 @@
#
# Test that wrapping the 'jam' build system produces instrumented binaries.
#
-. t/libtap.subr
. t/utils.subr
plan 6
diff --git a/t/wrap_make.sh b/t/wrap_make.sh
@@ -2,7 +2,6 @@
#
# Test that wrapping the 'make' build system produces instrumented binaries.
#
-. t/libtap.subr
. t/utils.subr
plan 6
diff --git a/t/wrap_ninja.sh b/t/wrap_ninja.sh
@@ -2,7 +2,6 @@
#
# Test that wrapping the 'ninja' build system produces instrumented binaries.
#
-. t/libtap.subr
. t/utils.subr
plan 6
diff --git a/t/wrap_parallel.sh b/t/wrap_parallel.sh
@@ -2,7 +2,6 @@
#
# Test that wrapping the 'make' build system produces instrumented binaries.
#
-. t/libtap.subr
. t/utils.subr
plan 12
