summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Pokorný <jpokorny@redhat.com>2014-11-11 15:11:24 +0100
committerJan Pokorný <jpokorny@redhat.com>2014-11-14 22:10:59 +0100
commitb0a101061272f80f8ad5b28f633a040bb47b84a8 (patch)
tree7b6279c7a930b01237f6f1c09ff2a743691347c0
parent6530681f7a10fcbfa3516af48f9a5df39e2ed920 (diff)
downloadclufter-b0a101061272f80f8ad5b28f633a040bb47b84a8.tar.gz
clufter-b0a101061272f80f8ad5b28f633a040bb47b84a8.tar.xz
clufter-b0a101061272f80f8ad5b28f633a040bb47b84a8.zip
run-check: fix and apply use of "norun" context (when sourced)
Commit that got it originally wrong on the "provider" side (check its full commit message): run-check: pass provided switches down to clufter invocation Signed-off-by: Jan Pokorný <jpokorny@redhat.com>
-rwxr-xr-x__root__/run-check2
-rwxr-xr-x__root__/run-tests2
2 files changed, 2 insertions, 2 deletions
diff --git a/__root__/run-check b/__root__/run-check
index f2b28b7..d3a9d9a 100755
--- a/__root__/run-check
+++ b/__root__/run-check
@@ -29,7 +29,7 @@ which ccs_flatten 2>/dev/null || (
ln -fs -- build/ccs_flatten .
) || { ret=$?; echo "ccs_flatten missing, cannot be built"; exit ${ret}; }
-if [ "${s}" != "__norun__" ]; then
+if [ "${1}" != "__norun__" ]; then
# self-check for sanity usage
testcib="$(mktemp)" testcoro="$(mktemp)"
{ ${PYTHONEXEC} run-dev ccs2pcs-needle "${@}" -- - "${testcib}" "${testcoro}" \
diff --git a/__root__/run-tests b/__root__/run-tests
index a85712f..501f232 100755
--- a/__root__/run-tests
+++ b/__root__/run-tests
@@ -9,7 +9,7 @@
# ---
# [1] http://docs.python.org/2/library/unittest.html#command-line-interface
-. ./run-check "$(dirname "${0}")/run-check"
+. ./run-check "$(dirname "${0}")/run-check" __norun__
stop=$(printf "\033\[0m")
blue=$(printf "\033[01;34m") red=$(printf "\033[01;31m")