diff options
-rwxr-xr-x | t/t3000-revactor-basic.sh | 1 | ||||
-rwxr-xr-x | t/t3001-revactor-pipeline.sh | 1 | ||||
-rwxr-xr-x | t/t3003-revactor-reopen-logs.sh | 1 | ||||
-rwxr-xr-x | t/t3100-revactor-tee-input.sh | 1 | ||||
-rwxr-xr-x | t/t4000-rev-basic.sh | 1 | ||||
-rwxr-xr-x | t/t4100-rev-rack-input.sh | 1 | ||||
-rw-r--r-- | t/test-lib.sh | 26 |
7 files changed, 10 insertions, 22 deletions
diff --git a/t/t3000-revactor-basic.sh b/t/t3000-revactor-basic.sh index 29d9b98..856c1ca 100755 --- a/t/t3000-revactor-basic.sh +++ b/t/t3000-revactor-basic.sh @@ -1,6 +1,5 @@ #!/bin/sh . ./test-lib.sh -require_revactor eval $(unused_listen) rtmpfiles unicorn_config curl_out curl_err pid r_err r_out diff --git a/t/t3001-revactor-pipeline.sh b/t/t3001-revactor-pipeline.sh index e5aa3ee..e00bdca 100755 --- a/t/t3001-revactor-pipeline.sh +++ b/t/t3001-revactor-pipeline.sh @@ -1,6 +1,5 @@ #!/bin/sh . ./test-lib.sh -require_revactor eval $(unused_listen) rtmpfiles unicorn_config curl_out curl_err pid fifo tmp ok r_err r_out diff --git a/t/t3003-revactor-reopen-logs.sh b/t/t3003-revactor-reopen-logs.sh index 8b11c19..47b2eaf 100755 --- a/t/t3003-revactor-reopen-logs.sh +++ b/t/t3003-revactor-reopen-logs.sh @@ -1,6 +1,5 @@ #!/bin/sh . ./test-lib.sh -require_revactor eval $(unused_listen) rtmpfiles unicorn_config curl_out curl_err pid r_err r_out r_rot diff --git a/t/t3100-revactor-tee-input.sh b/t/t3100-revactor-tee-input.sh index 08ffd33..5b580b5 100755 --- a/t/t3100-revactor-tee-input.sh +++ b/t/t3100-revactor-tee-input.sh @@ -3,7 +3,6 @@ nr_client=${nr_client-25} nr_actor=${nr_actor-50} . ./test-lib.sh -require_revactor test -r random_blob || die "random_blob required, run with 'make $0'" eval $(unused_listen) diff --git a/t/t4000-rev-basic.sh b/t/t4000-rev-basic.sh index e5cfcad..df1f338 100755 --- a/t/t4000-rev-basic.sh +++ b/t/t4000-rev-basic.sh @@ -1,6 +1,5 @@ #!/bin/sh . ./test-lib.sh -require_rev eval $(unused_listen) rtmpfiles unicorn_config pid r_err r_out tmp fifo ok diff --git a/t/t4100-rev-rack-input.sh b/t/t4100-rev-rack-input.sh index 2a37fed..2368269 100755 --- a/t/t4100-rev-rack-input.sh +++ b/t/t4100-rev-rack-input.sh @@ -3,7 +3,6 @@ nr_client=${nr_client-25} nr=${nr-50} . ./test-lib.sh -require_rev test -r random_blob || die "random_blob required, run with 'make $0'" eval $(unused_listen) diff --git a/t/test-lib.sh b/t/test-lib.sh index 4f523c0..54d1b2d 100644 --- a/t/test-lib.sh +++ b/t/test-lib.sh @@ -30,11 +30,6 @@ fi set -u ruby="${ruby-ruby}" -case $model in -Rev) require_rev ;; -Revactor) require_revactor ;; -esac - # ensure a sane environment TZ=UTC LC_ALL=C LANG=C export LANG LC_ALL TZ @@ -62,18 +57,12 @@ wait_for_pid () { done } -require_revactor () { - if ! $ruby -rrevactor -e "puts Revactor::VERSION" >/dev/null 2>&1 +require_check () { + lib=$1 + const=$2 + if ! $ruby -r$lib -e "puts $const" >/dev/null 2>&1 then - echo >&2 "skipping $T since we don't have Revactor" - exit 0 - fi -} - -require_rev() { - if ! $ruby -rrev -e "puts Rev::VERSION" >/dev/null 2>&1 - then - echo >&2 "skipping $T since we don't have Rev" + echo >&2 "skipping $T since we don't have $lib" exit 0 fi } @@ -95,3 +84,8 @@ dbgcat () { echo "==> $id <==" sed -e "s/^/$id:/" < $_file } + +case $model in +Rev) require_check rev Rev::VERSION ;; +Revactor) require_check revactor Revactor::VERSION ;; +esac |