commit 798677647a7bc304e2aa96194a1d5f9d51263fee
parent ba7311951d8e93916c1b134d16efa5c3bab7499a
Author: Kyle Milz <kyle@0x30.net>
Date: Sun, 18 Dec 2016 17:25:39 -0700
t: always modify_PATH
Diffstat:
32 files changed, 2 insertions(+), 37 deletions(-)
diff --git a/t/check_baddir.sh b/t/check_baddir.sh
@@ -5,7 +5,6 @@
. t/utils.subr
plan 1
-modify_PATH
output_good="find: _nonexistent_dir_: No such file or directory
Summary:
diff --git a/t/check_empty.sh b/t/check_empty.sh
@@ -5,7 +5,6 @@
. t/utils.subr
plan 1
-modify_PATH
enter_tmpdir
output_good="Summary:
diff --git a/t/check_spaces.sh b/t/check_spaces.sh
@@ -5,7 +5,6 @@
. t/utils.subr
plan 2
-modify_PATH
enter_tmpdir
ok "are dirs with spaces in name created" mkdir dir\ a dir\ b
diff --git a/t/e2e_ansi.sh b/t/e2e_ansi.sh
@@ -6,7 +6,6 @@
. t/utils.subr
plan 4
-modify_PATH
enter_tmpdir
cat <<EOF > main.c
diff --git a/t/e2e_basic.sh b/t/e2e_basic.sh
@@ -5,7 +5,6 @@
. t/utils.subr
plan 7
-modify_PATH
enter_tmpdir
cat <<EOF > fib.c
diff --git a/t/e2e_stdout.sh b/t/e2e_stdout.sh
@@ -5,7 +5,6 @@
. t/utils.subr
plan 5
-modify_PATH
enter_tmpdir
cat <<EOF > hello.c
diff --git a/t/inst_basic_link.sh b/t/inst_basic_link.sh
@@ -5,7 +5,6 @@
. t/utils.subr
plan 4
-modify_PATH
enter_tmpdir
cat <<EOF > main.c
diff --git a/t/inst_binop.sh b/t/inst_binop.sh
@@ -5,7 +5,6 @@
. t/utils.subr
plan 5
-modify_PATH
enter_tmpdir
cat <<EOF > enum.c
diff --git a/t/inst_dowhile.sh b/t/inst_dowhile.sh
@@ -5,7 +5,6 @@
. t/utils.subr
plan 5
-modify_PATH
enter_tmpdir
cat <<EOF > while.c
diff --git a/t/inst_fail.sh b/t/inst_fail.sh
@@ -5,7 +5,6 @@
. t/utils.subr
plan 4
-modify_PATH
enter_tmpdir
echo "int main(void) { return 0; " > bad.c
diff --git a/t/inst_for.sh b/t/inst_for.sh
@@ -5,7 +5,6 @@
. t/utils.subr
plan 5
-modify_PATH
enter_tmpdir
cat <<EOF > for.c
diff --git a/t/inst_funcdef.sh b/t/inst_funcdef.sh
@@ -5,7 +5,6 @@
. t/utils.subr
plan 5
-modify_PATH
enter_tmpdir
cat <<EOF > funcdef.c
diff --git a/t/inst_if.sh b/t/inst_if.sh
@@ -5,7 +5,6 @@
. t/utils.subr
plan 5
-modify_PATH
enter_tmpdir
cat <<EOF > if.c
diff --git a/t/inst_link_multiple.sh b/t/inst_link_multiple.sh
@@ -5,7 +5,6 @@
. t/utils.subr
plan 4
-modify_PATH
enter_tmpdir
cat <<EOF > one.c
diff --git a/t/inst_log.sh b/t/inst_log.sh
@@ -6,7 +6,6 @@
. t/utils.subr
plan 3
-modify_PATH
enter_tmpdir
cat <<EOF > main.c
diff --git a/t/inst_macro.sh b/t/inst_macro.sh
@@ -6,7 +6,6 @@
. t/utils.subr
plan 5
-modify_PATH
enter_tmpdir
cat <<EOF > macro.c
diff --git a/t/inst_preamble.sh b/t/inst_preamble.sh
@@ -5,7 +5,6 @@
. t/utils.subr
plan 3
-modify_PATH
enter_tmpdir
touch preamble.c
diff --git a/t/inst_preprocess.sh b/t/inst_preprocess.sh
@@ -5,7 +5,6 @@
. t/utils.subr
plan 3
-modify_PATH
enter_tmpdir
echo "int main(void) { return 0; }" > prepro.c
diff --git a/t/inst_return.sh b/t/inst_return.sh
@@ -5,7 +5,6 @@
. t/utils.subr
plan 5
-modify_PATH
enter_tmpdir
cat <<EOF > return.c
diff --git a/t/inst_src_ext.sh b/t/inst_src_ext.sh
@@ -5,7 +5,6 @@
. t/utils.subr
plan 8
-modify_PATH
enter_tmpdir
touch main.{c,cc,cxx,cpp,C}
diff --git a/t/inst_switch.sh b/t/inst_switch.sh
@@ -5,7 +5,6 @@
. t/utils.subr
plan 5
-modify_PATH
enter_tmpdir
cat <<EOF > switch.c
diff --git a/t/inst_two_src.sh b/t/inst_two_src.sh
@@ -6,7 +6,6 @@
. t/utils.subr
plan 4
-modify_PATH
enter_tmpdir
cat <<EOF > main.c
diff --git a/t/inst_while.sh b/t/inst_while.sh
@@ -5,7 +5,6 @@
. t/utils.subr
plan 5
-modify_PATH
enter_tmpdir
cat <<EOF > while.c
diff --git a/t/utils.subr b/t/utils.subr
@@ -1,5 +1,7 @@
. t/libtap.subr
+export PATH="`pwd`/src:${PATH}"
+
strip_preamble()
{
file="${1}"
@@ -20,11 +22,6 @@ strip_millis()
ok "are milliseconds sanitized" sed -i -e "/Milliseconds spent/d" $1
}
-modify_PATH()
-{
- export PATH="`pwd`/src:${PATH}"
-}
-
enter_tmpdir()
{
# Assume that a script wanting to enter a tmpdir also wants a local
diff --git a/t/wrap_badsrc.sh b/t/wrap_badsrc.sh
@@ -5,7 +5,6 @@
. t/utils.subr
plan 4
-modify_PATH
enter_tmpdir
output_good="citrun-inst: stat: No such file or directory"
diff --git a/t/wrap_cmake.sh b/t/wrap_cmake.sh
@@ -5,7 +5,6 @@
. t/utils.subr
plan 7
-modify_PATH
enter_tmpdir
cat <<EOF > main.c
diff --git a/t/wrap_exitcode.sh b/t/wrap_exitcode.sh
@@ -5,7 +5,6 @@
. t/utils.subr
plan 1
-modify_PATH
output_good="ls: asdfasdfsaf: No such file or directory"
ok_program "build command exit code" 1 "$output_good" citrun-wrap ls asdfasdfsaf
diff --git a/t/wrap_jam.sh b/t/wrap_jam.sh
@@ -5,7 +5,6 @@
. t/utils.subr
plan 6
-modify_PATH
enter_tmpdir
cat <<EOF > main.c
diff --git a/t/wrap_make.sh b/t/wrap_make.sh
@@ -5,7 +5,6 @@
. t/utils.subr
plan 6
-modify_PATH
enter_tmpdir
cat <<EOF > main.c
diff --git a/t/wrap_ninja.sh b/t/wrap_ninja.sh
@@ -5,7 +5,6 @@
. t/utils.subr
plan 6
-modify_PATH
enter_tmpdir
cat <<EOF > main.c
diff --git a/t/wrap_parallel.sh b/t/wrap_parallel.sh
@@ -5,7 +5,6 @@
. t/utils.subr
plan 12
-modify_PATH
enter_tmpdir
cat <<EOF > main1.c
diff --git a/tt/package.subr b/tt/package.subr
@@ -8,8 +8,6 @@ portdir="/usr/ports/$1"
workdir=`make -C $portdir show=WRKDIST`
treedir=`pwd`
-modify_PATH
-
pkg_check_deps()
{
make -C $portdir full-build-depends > deps
