From de580e7999400b7d8789ce3747db4f2a63f2538b Mon Sep 17 00:00:00 2001
From: "Rafael G. Martins" <rafael@rafaelmartins.eng.br>
Date: Wed, 12 Oct 2016 02:44:25 +0200
Subject: build: use bash, but get it properly during build time

hardcoding it for travis, as bash is always installed there.
---
 tests/blogc-git-receiver/check_post_receive.sh    |  86 -------------
 tests/blogc-git-receiver/check_post_receive.sh.in |  86 +++++++++++++
 tests/blogc-git-receiver/check_pre_receive.sh     | 146 ----------------------
 tests/blogc-git-receiver/check_pre_receive.sh.in  | 146 ++++++++++++++++++++++
 tests/blogc-git-receiver/check_shell.sh           |  73 -----------
 tests/blogc-git-receiver/check_shell.sh.in        |  73 +++++++++++
 6 files changed, 305 insertions(+), 305 deletions(-)
 delete mode 100755 tests/blogc-git-receiver/check_post_receive.sh
 create mode 100755 tests/blogc-git-receiver/check_post_receive.sh.in
 delete mode 100755 tests/blogc-git-receiver/check_pre_receive.sh
 create mode 100755 tests/blogc-git-receiver/check_pre_receive.sh.in
 delete mode 100755 tests/blogc-git-receiver/check_shell.sh
 create mode 100755 tests/blogc-git-receiver/check_shell.sh.in

(limited to 'tests')

diff --git a/tests/blogc-git-receiver/check_post_receive.sh b/tests/blogc-git-receiver/check_post_receive.sh
deleted file mode 100755
index ac07c64..0000000
--- a/tests/blogc-git-receiver/check_post_receive.sh
+++ /dev/null
@@ -1,86 +0,0 @@
-#!/bin/sh
-
-set -xe -o pipefail
-
-export LC_ALL=C
-
-TEMP="$(mktemp -d)"
-[[ -n "${TEMP}" ]]
-
-trap_func() {
-    [[ -e "${TEMP}/output.txt" ]] && cat "${TEMP}/output.txt"
-    [[ -n "${TEMP}" ]] && rm -rf "${TEMP}"
-}
-
-trap trap_func EXIT
-
-mkdir -p "${TEMP}/repos"
-git init --bare "${TEMP}/repos/foo.git" &> /dev/null
-
-ln -s "${PWD}/blogc-git-receiver" "${TEMP}/repos/foo.git/hooks/post-receive"
-
-cat > "${TEMP}/tmp.txt" <<EOF
-blob
-mark :1
-data 4
-bar
-
-reset refs/heads/master
-commit refs/heads/master
-mark :2
-author Rafael G. Martins <rafael@rafaelmartins.eng.br> 1476033730 +0200
-committer Rafael G. Martins <rafael@rafaelmartins.eng.br> 1476033888 +0200
-data 11
-testing...
-M 100644 :1 foo
-
-EOF
-
-cd "${TEMP}/repos/foo.git"
-git fast-import < "${TEMP}/tmp.txt" &> /dev/null
-
-git init --bare "${TEMP}/repos/bar.git" &> /dev/null
-
-HOME="${TEMP}" ${TESTS_ENVIRONMENT} ./hooks/post-receive 2>&1 | tee "${TEMP}/output.txt"
-grep "warning: repository mirroring disabled" "${TEMP}/output.txt" &> /dev/null
-
-git config --local remote.mirror.pushurl "${TEMP}/repos/bar.git"
-HOME="${TEMP}" ${TESTS_ENVIRONMENT} ./hooks/post-receive 2>&1 | tee "${TEMP}/output.txt"
-grep "[new branch] *master" "${TEMP}/output.txt" &> /dev/null
-
-git config --local --unset remote.mirror.pushurl
-git init --bare "${TEMP}/repos/bar2.git" &> /dev/null
-git config --local remote.mirror.url "${TEMP}/repos/bar2.git"
-HOME="${TEMP}" ${TESTS_ENVIRONMENT} ./hooks/post-receive 2>&1 | tee "${TEMP}/output.txt"
-grep "[new branch] *master" "${TEMP}/output.txt" &> /dev/null
-
-git config --local --unset remote.mirror.url
-cat > "${TEMP}/blogc-git-receiver.ini" <<EOF
-[repo:boo.git]
-mirror = 123
-
-[repo:foo.git]
-mirror = ${TEMP}/repos/bar3.git
-
-[repo:bar.git]
-mirror = lol
-EOF
-git init --bare "${TEMP}/repos/bar3.git" &> /dev/null
-HOME="${TEMP}" ${TESTS_ENVIRONMENT} ./hooks/post-receive 2>&1 | tee "${TEMP}/output.txt"
-grep "[new branch] *master" "${TEMP}/output.txt" &> /dev/null
-
-cat > "${TEMP}/blogc-git-receiver.ini" <<EOF
-asd[repo:boo.git]
-mirror = 123
-
-[repo:foo.git]
-mirror = ${TEMP}/repos/bar4.git
-
-[repo:bar.git]
-mirror = lol
-EOF
-git init --bare "${TEMP}/repos/bar4.git" &> /dev/null
-HOME="${TEMP}" ${TESTS_ENVIRONMENT} ./hooks/post-receive 2>&1 | tee "${TEMP}/output.txt"
-grep "warning: failed to parse configuration file " "${TEMP}/output.txt" &> /dev/null
-
-rm "${TEMP}/output.txt"
diff --git a/tests/blogc-git-receiver/check_post_receive.sh.in b/tests/blogc-git-receiver/check_post_receive.sh.in
new file mode 100755
index 0000000..6ed7f9d
--- /dev/null
+++ b/tests/blogc-git-receiver/check_post_receive.sh.in
@@ -0,0 +1,86 @@
+#!@BASH@
+
+set -xe -o pipefail
+
+export LC_ALL=C
+
+TEMP="$(mktemp -d)"
+[[ -n "${TEMP}" ]]
+
+trap_func() {
+    [[ -e "${TEMP}/output.txt" ]] && cat "${TEMP}/output.txt"
+    [[ -n "${TEMP}" ]] && rm -rf "${TEMP}"
+}
+
+trap trap_func EXIT
+
+mkdir -p "${TEMP}/repos"
+git init --bare "${TEMP}/repos/foo.git" &> /dev/null
+
+ln -s "${PWD}/blogc-git-receiver" "${TEMP}/repos/foo.git/hooks/post-receive"
+
+cat > "${TEMP}/tmp.txt" <<EOF
+blob
+mark :1
+data 4
+bar
+
+reset refs/heads/master
+commit refs/heads/master
+mark :2
+author Rafael G. Martins <rafael@rafaelmartins.eng.br> 1476033730 +0200
+committer Rafael G. Martins <rafael@rafaelmartins.eng.br> 1476033888 +0200
+data 11
+testing...
+M 100644 :1 foo
+
+EOF
+
+cd "${TEMP}/repos/foo.git"
+git fast-import < "${TEMP}/tmp.txt" &> /dev/null
+
+git init --bare "${TEMP}/repos/bar.git" &> /dev/null
+
+HOME="${TEMP}" ${TESTS_ENVIRONMENT} ./hooks/post-receive 2>&1 | tee "${TEMP}/output.txt"
+grep "warning: repository mirroring disabled" "${TEMP}/output.txt" &> /dev/null
+
+git config --local remote.mirror.pushurl "${TEMP}/repos/bar.git"
+HOME="${TEMP}" ${TESTS_ENVIRONMENT} ./hooks/post-receive 2>&1 | tee "${TEMP}/output.txt"
+grep "[new branch] *master" "${TEMP}/output.txt" &> /dev/null
+
+git config --local --unset remote.mirror.pushurl
+git init --bare "${TEMP}/repos/bar2.git" &> /dev/null
+git config --local remote.mirror.url "${TEMP}/repos/bar2.git"
+HOME="${TEMP}" ${TESTS_ENVIRONMENT} ./hooks/post-receive 2>&1 | tee "${TEMP}/output.txt"
+grep "[new branch] *master" "${TEMP}/output.txt" &> /dev/null
+
+git config --local --unset remote.mirror.url
+cat > "${TEMP}/blogc-git-receiver.ini" <<EOF
+[repo:boo.git]
+mirror = 123
+
+[repo:foo.git]
+mirror = ${TEMP}/repos/bar3.git
+
+[repo:bar.git]
+mirror = lol
+EOF
+git init --bare "${TEMP}/repos/bar3.git" &> /dev/null
+HOME="${TEMP}" ${TESTS_ENVIRONMENT} ./hooks/post-receive 2>&1 | tee "${TEMP}/output.txt"
+grep "[new branch] *master" "${TEMP}/output.txt" &> /dev/null
+
+cat > "${TEMP}/blogc-git-receiver.ini" <<EOF
+asd[repo:boo.git]
+mirror = 123
+
+[repo:foo.git]
+mirror = ${TEMP}/repos/bar4.git
+
+[repo:bar.git]
+mirror = lol
+EOF
+git init --bare "${TEMP}/repos/bar4.git" &> /dev/null
+HOME="${TEMP}" ${TESTS_ENVIRONMENT} ./hooks/post-receive 2>&1 | tee "${TEMP}/output.txt"
+grep "warning: failed to parse configuration file " "${TEMP}/output.txt" &> /dev/null
+
+rm "${TEMP}/output.txt"
diff --git a/tests/blogc-git-receiver/check_pre_receive.sh b/tests/blogc-git-receiver/check_pre_receive.sh
deleted file mode 100755
index 2df713a..0000000
--- a/tests/blogc-git-receiver/check_pre_receive.sh
+++ /dev/null
@@ -1,146 +0,0 @@
-#!/bin/sh
-
-set -xe -o pipefail
-
-export LC_ALL=C
-
-TEMP="$(mktemp -d)"
-[[ -n "${TEMP}" ]]
-
-trap_func() {
-    [[ -e "${TEMP}/output.txt" ]] && cat "${TEMP}/output.txt"
-    [[ -n "${TEMP}" ]] && rm -rf "${TEMP}"
-}
-
-trap trap_func EXIT
-
-mkdir -p "${TEMP}/repos"
-git init --bare "${TEMP}/repos/foo.git" &> /dev/null
-
-SELF="${PWD}/blogc-git-receiver"
-
-ln -s "${SELF}" "${TEMP}/repos/foo.git/hooks/pre-receive"
-
-cat > "${TEMP}/payload.txt" <<EOF
-0000000000000000000000000000000000000000 0000000000000000000000000000000000000000 refs/heads/foo
-0000000000000000000000000000000000000000 0000000000000000000000000000000000000000 refs/heads/bar
-EOF
-
-cd "${TEMP}/repos/foo.git"
-
-SHELL="${SELF}" HOME="${TEMP}" ${TESTS_ENVIRONMENT} ./hooks/pre-receive < "${TEMP}/payload.txt" 2>&1 | tee "${TEMP}/output.txt"
-grep "warning: no reference to master branch found. nothing to deploy." "${TEMP}/output.txt" &> /dev/null
-
-cat > "${TEMP}/tmp.txt" <<EOF
-blob
-mark :1
-data 63
-all:
-	mkdir -p \$(OUTPUT_DIR)
-	echo lol > \$(OUTPUT_DIR)/foo.txt
-
-reset refs/heads/master
-commit refs/heads/master
-mark :2
-author Rafael G. Martins <rafael@rafaelmartins.eng.br> 1476139736 +0200
-committer Rafael G. Martins <rafael@rafaelmartins.eng.br> 1476139736 +0200
-data 11
-testing...
-M 100644 :1 Makefil
-
-EOF
-
-git fast-import < "${TEMP}/tmp.txt" &> /dev/null
-
-cat > "${TEMP}/payload.txt" <<EOF
-0000000000000000000000000000000000000000 0000000000000000000000000000000000000000 refs/heads/foo
-0000000000000000000000000000000000000000 $(git rev-parse HEAD) refs/heads/master
-0000000000000000000000000000000000000000 0000000000000000000000000000000000000000 refs/heads/bar
-EOF
-
-SHELL="${SELF}" HOME="${TEMP}" ${TESTS_ENVIRONMENT} ./hooks/pre-receive < "${TEMP}/payload.txt" 2>&1 | tee "${TEMP}/output.txt"
-grep "warning: no makefile found. skipping ..." "${TEMP}/output.txt" &> /dev/null
-
-cd "${TEMP}"
-git init --bare "${TEMP}/repos/foo2.git" &> /dev/null
-ln -s "${SELF}" "${TEMP}/repos/foo2.git/hooks/pre-receive"
-
-cat > "${TEMP}/tmp.txt" <<EOF
-blob
-mark :1
-data 63
-all:
-	mkdir -p \$(OUTPUT_DIR)
-	echo lol > \$(OUTPUT_DIR)/foo.txt
-
-reset refs/heads/master
-commit refs/heads/master
-mark :2
-author Rafael G. Martins <rafael@rafaelmartins.eng.br> 1476139736 +0200
-committer Rafael G. Martins <rafael@rafaelmartins.eng.br> 1476139736 +0200
-data 11
-testing...
-M 100644 :1 Makefile
-
-EOF
-
-cd "${TEMP}/repos/foo2.git"
-git fast-import < "${TEMP}/tmp.txt" &> /dev/null
-
-cat > "${TEMP}/payload.txt" <<EOF
-0000000000000000000000000000000000000000 0000000000000000000000000000000000000000 refs/heads/foo
-0000000000000000000000000000000000000000 $(git rev-parse HEAD) refs/heads/master
-0000000000000000000000000000000000000000 0000000000000000000000000000000000000000 refs/heads/bar
-EOF
-
-SHELL="${SELF}" HOME="${TEMP}" ${TESTS_ENVIRONMENT} ./hooks/pre-receive < "${TEMP}/payload.txt" 2>&1 | tee "${TEMP}/output.txt"
-grep "echo lol" "${TEMP}/output.txt" &> /dev/null
-
-[[ -h htdocs ]]
-[[ "$(cat htdocs/foo.txt)" == "lol" ]]
-
-DEST="$(readlink htdocs)"
-[[ -e "${DEST}" ]]
-
-cd "${TEMP}"
-git init --bare "${TEMP}/repos/foo3.git" &> /dev/null
-ln -s "${SELF}" "${TEMP}/repos/foo3.git/hooks/pre-receive"
-
-cat > "${TEMP}/tmp.txt" <<EOF
-blob
-mark :1
-data 64
-all:
-	mkdir -p \$(OUTPUT_DIR)
-	echo lol > \$(OUTPUT_DIR)/foo.txt
-
-
-commit refs/heads/master
-mark :2
-author Rafael G. Martins <rafael@rafaelmartins.eng.br> 1476142917 +0200
-committer Rafael G. Martins <rafael@rafaelmartins.eng.br> 1476142917 +0200
-data 12
-testing2...
-M 100644 :1 Makefile
-
-EOF
-
-cd "${TEMP}/repos/foo3.git"
-ln -s "${DEST}" htdocs
-git fast-import < "${TEMP}/tmp.txt" &> /dev/null
-
-cat > "${TEMP}/payload.txt" <<EOF
-0000000000000000000000000000000000000000 0000000000000000000000000000000000000000 refs/heads/foo
-0000000000000000000000000000000000000000 $(git rev-parse HEAD) refs/heads/master
-0000000000000000000000000000000000000000 0000000000000000000000000000000000000000 refs/heads/bar
-EOF
-
-SHELL="${SELF}" HOME="${TEMP}" ${TESTS_ENVIRONMENT} ./hooks/pre-receive < "${TEMP}/payload.txt" 2>&1 | tee "${TEMP}/output.txt"
-grep "echo lol" "${TEMP}/output.txt" &> /dev/null
-
-[[ -h htdocs ]]
-[[ "$(cat htdocs/foo.txt)" == "lol" ]]
-[[ "${DEST}" != "$(readlink htdocs)" ]]
-[[ ! -e "${DEST}" ]]
-
-rm "${TEMP}/output.txt"
diff --git a/tests/blogc-git-receiver/check_pre_receive.sh.in b/tests/blogc-git-receiver/check_pre_receive.sh.in
new file mode 100755
index 0000000..10fd4d9
--- /dev/null
+++ b/tests/blogc-git-receiver/check_pre_receive.sh.in
@@ -0,0 +1,146 @@
+#!@BASH@
+
+set -xe -o pipefail
+
+export LC_ALL=C
+
+TEMP="$(mktemp -d)"
+[[ -n "${TEMP}" ]]
+
+trap_func() {
+    [[ -e "${TEMP}/output.txt" ]] && cat "${TEMP}/output.txt"
+    [[ -n "${TEMP}" ]] && rm -rf "${TEMP}"
+}
+
+trap trap_func EXIT
+
+mkdir -p "${TEMP}/repos"
+git init --bare "${TEMP}/repos/foo.git" &> /dev/null
+
+SELF="${PWD}/blogc-git-receiver"
+
+ln -s "${SELF}" "${TEMP}/repos/foo.git/hooks/pre-receive"
+
+cat > "${TEMP}/payload.txt" <<EOF
+0000000000000000000000000000000000000000 0000000000000000000000000000000000000000 refs/heads/foo
+0000000000000000000000000000000000000000 0000000000000000000000000000000000000000 refs/heads/bar
+EOF
+
+cd "${TEMP}/repos/foo.git"
+
+SHELL="${SELF}" HOME="${TEMP}" ${TESTS_ENVIRONMENT} ./hooks/pre-receive < "${TEMP}/payload.txt" 2>&1 | tee "${TEMP}/output.txt"
+grep "warning: no reference to master branch found. nothing to deploy." "${TEMP}/output.txt" &> /dev/null
+
+cat > "${TEMP}/tmp.txt" <<EOF
+blob
+mark :1
+data 63
+all:
+	mkdir -p \$(OUTPUT_DIR)
+	echo lol > \$(OUTPUT_DIR)/foo.txt
+
+reset refs/heads/master
+commit refs/heads/master
+mark :2
+author Rafael G. Martins <rafael@rafaelmartins.eng.br> 1476139736 +0200
+committer Rafael G. Martins <rafael@rafaelmartins.eng.br> 1476139736 +0200
+data 11
+testing...
+M 100644 :1 Makefil
+
+EOF
+
+git fast-import < "${TEMP}/tmp.txt" &> /dev/null
+
+cat > "${TEMP}/payload.txt" <<EOF
+0000000000000000000000000000000000000000 0000000000000000000000000000000000000000 refs/heads/foo
+0000000000000000000000000000000000000000 $(git rev-parse HEAD) refs/heads/master
+0000000000000000000000000000000000000000 0000000000000000000000000000000000000000 refs/heads/bar
+EOF
+
+SHELL="${SELF}" HOME="${TEMP}" ${TESTS_ENVIRONMENT} ./hooks/pre-receive < "${TEMP}/payload.txt" 2>&1 | tee "${TEMP}/output.txt"
+grep "warning: no makefile found. skipping ..." "${TEMP}/output.txt" &> /dev/null
+
+cd "${TEMP}"
+git init --bare "${TEMP}/repos/foo2.git" &> /dev/null
+ln -s "${SELF}" "${TEMP}/repos/foo2.git/hooks/pre-receive"
+
+cat > "${TEMP}/tmp.txt" <<EOF
+blob
+mark :1
+data 63
+all:
+	mkdir -p \$(OUTPUT_DIR)
+	echo lol > \$(OUTPUT_DIR)/foo.txt
+
+reset refs/heads/master
+commit refs/heads/master
+mark :2
+author Rafael G. Martins <rafael@rafaelmartins.eng.br> 1476139736 +0200
+committer Rafael G. Martins <rafael@rafaelmartins.eng.br> 1476139736 +0200
+data 11
+testing...
+M 100644 :1 Makefile
+
+EOF
+
+cd "${TEMP}/repos/foo2.git"
+git fast-import < "${TEMP}/tmp.txt" &> /dev/null
+
+cat > "${TEMP}/payload.txt" <<EOF
+0000000000000000000000000000000000000000 0000000000000000000000000000000000000000 refs/heads/foo
+0000000000000000000000000000000000000000 $(git rev-parse HEAD) refs/heads/master
+0000000000000000000000000000000000000000 0000000000000000000000000000000000000000 refs/heads/bar
+EOF
+
+SHELL="${SELF}" HOME="${TEMP}" ${TESTS_ENVIRONMENT} ./hooks/pre-receive < "${TEMP}/payload.txt" 2>&1 | tee "${TEMP}/output.txt"
+grep "echo lol" "${TEMP}/output.txt" &> /dev/null
+
+[[ -h htdocs ]]
+[[ "$(cat htdocs/foo.txt)" == "lol" ]]
+
+DEST="$(readlink htdocs)"
+[[ -e "${DEST}" ]]
+
+cd "${TEMP}"
+git init --bare "${TEMP}/repos/foo3.git" &> /dev/null
+ln -s "${SELF}" "${TEMP}/repos/foo3.git/hooks/pre-receive"
+
+cat > "${TEMP}/tmp.txt" <<EOF
+blob
+mark :1
+data 64
+all:
+	mkdir -p \$(OUTPUT_DIR)
+	echo lol > \$(OUTPUT_DIR)/foo.txt
+
+
+commit refs/heads/master
+mark :2
+author Rafael G. Martins <rafael@rafaelmartins.eng.br> 1476142917 +0200
+committer Rafael G. Martins <rafael@rafaelmartins.eng.br> 1476142917 +0200
+data 12
+testing2...
+M 100644 :1 Makefile
+
+EOF
+
+cd "${TEMP}/repos/foo3.git"
+ln -s "${DEST}" htdocs
+git fast-import < "${TEMP}/tmp.txt" &> /dev/null
+
+cat > "${TEMP}/payload.txt" <<EOF
+0000000000000000000000000000000000000000 0000000000000000000000000000000000000000 refs/heads/foo
+0000000000000000000000000000000000000000 $(git rev-parse HEAD) refs/heads/master
+0000000000000000000000000000000000000000 0000000000000000000000000000000000000000 refs/heads/bar
+EOF
+
+SHELL="${SELF}" HOME="${TEMP}" ${TESTS_ENVIRONMENT} ./hooks/pre-receive < "${TEMP}/payload.txt" 2>&1 | tee "${TEMP}/output.txt"
+grep "echo lol" "${TEMP}/output.txt" &> /dev/null
+
+[[ -h htdocs ]]
+[[ "$(cat htdocs/foo.txt)" == "lol" ]]
+[[ "${DEST}" != "$(readlink htdocs)" ]]
+[[ ! -e "${DEST}" ]]
+
+rm "${TEMP}/output.txt"
diff --git a/tests/blogc-git-receiver/check_shell.sh b/tests/blogc-git-receiver/check_shell.sh
deleted file mode 100755
index f563c02..0000000
--- a/tests/blogc-git-receiver/check_shell.sh
+++ /dev/null
@@ -1,73 +0,0 @@
-#!/bin/sh
-
-set -xe -o pipefail
-
-export LC_ALL=C
-
-TEMP="$(mktemp -d)"
-[[ -n "${TEMP}" ]]
-
-trap_func() {
-    [[ -e "${TEMP}/output.txt" ]] && cat "${TEMP}/output.txt"
-    [[ -n "${TEMP}" ]] && rm -rf "${TEMP}"
-}
-
-trap trap_func EXIT
-
-SELF="${PWD}/blogc-git-receiver"
-
-call_bgr() {
-    [[ -n "${VALGRIND}" ]] && export __VALGRIND_ENABLED=1
-    SHELL="${SELF}" HOME="${TEMP}" ${TESTS_ENVIRONMENT} "${SELF}" "$@"
-}
-
-call_bgr -c "bola 'lol.git'" 2>&1 | tee "${TEMP}/output.txt" || true
-grep "error: invalid git-shell command: bola 'lol\.git'" "${TEMP}/output.txt" &> /dev/null
-
-echo 0000 | call_bgr -c "git-receive-pack 'lol.git'" 2>&1 > "${TEMP}/output.txt"
-if [[ -n "${VALGRIND}" ]]; then
-    grep "git-shell -c \"git-receive-pack '.*repos/lol.git'\"" "${TEMP}/output.txt" &> /dev/null
-else
-    grep "agent=" "${TEMP}/output.txt" &> /dev/null
-fi
-[[ -d "${TEMP}/repos/lol.git" ]]
-[[ -h "${TEMP}/repos/lol.git/hooks/pre-receive" ]]
-[[ "$(readlink "${TEMP}/repos/lol.git/hooks/pre-receive")" == "${SELF}" ]]
-[[ -h "${TEMP}/repos/lol.git/hooks/post-receive" ]]
-[[ "$(readlink "${TEMP}/repos/lol.git/hooks/post-receive")" == "${SELF}" ]]
-
-cat > "${TEMP}/tmp.txt" <<EOF
-blob
-mark :1
-data 4
-bar
-
-reset refs/heads/master
-commit refs/heads/master
-mark :2
-author Rafael G. Martins <rafael@rafaelmartins.eng.br> 1476033730 +0200
-committer Rafael G. Martins <rafael@rafaelmartins.eng.br> 1476033888 +0200
-data 11
-testing...
-M 100644 :1 foo
-
-EOF
-cd "${TEMP}/repos/lol.git"
-git fast-import < "${TEMP}/tmp.txt" &> /dev/null
-cd - > /dev/null
-
-echo 0000 | call_bgr -c "git-upload-pack 'lol.git'" 2>&1 > "${TEMP}/output.txt"
-if [[ -n "${VALGRIND}" ]]; then
-    grep "git-shell -c \"git-upload-pack '.*repos/lol.git'\"" "${TEMP}/output.txt" &> /dev/null
-else
-    grep "agent=" "${TEMP}/output.txt" &> /dev/null
-fi
-
-echo 0000 | call_bgr -c "git-upload-archive 'lol.git'" 2>&1 > "${TEMP}/output.txt" || true
-if [[ -n "${VALGRIND}" ]]; then
-    grep "git-shell -c \"git-upload-archive '.*repos/lol.git'\"" "${TEMP}/output.txt" &> /dev/null
-else
-    grep "ACK" "${TEMP}/output.txt" &> /dev/null
-fi
-
-rm "${TEMP}/output.txt"
diff --git a/tests/blogc-git-receiver/check_shell.sh.in b/tests/blogc-git-receiver/check_shell.sh.in
new file mode 100755
index 0000000..0099df3
--- /dev/null
+++ b/tests/blogc-git-receiver/check_shell.sh.in
@@ -0,0 +1,73 @@
+#!@BASH@
+
+set -xe -o pipefail
+
+export LC_ALL=C
+
+TEMP="$(mktemp -d)"
+[[ -n "${TEMP}" ]]
+
+trap_func() {
+    [[ -e "${TEMP}/output.txt" ]] && cat "${TEMP}/output.txt"
+    [[ -n "${TEMP}" ]] && rm -rf "${TEMP}"
+}
+
+trap trap_func EXIT
+
+SELF="${PWD}/blogc-git-receiver"
+
+call_bgr() {
+    [[ -n "${VALGRIND}" ]] && export __VALGRIND_ENABLED=1
+    SHELL="${SELF}" HOME="${TEMP}" ${TESTS_ENVIRONMENT} "${SELF}" "$@"
+}
+
+call_bgr -c "bola 'lol.git'" 2>&1 | tee "${TEMP}/output.txt" || true
+grep "error: invalid git-shell command: bola 'lol\.git'" "${TEMP}/output.txt" &> /dev/null
+
+echo 0000 | call_bgr -c "git-receive-pack 'lol.git'" 2>&1 > "${TEMP}/output.txt"
+if [[ -n "${VALGRIND}" ]]; then
+    grep "git-shell -c \"git-receive-pack '.*repos/lol.git'\"" "${TEMP}/output.txt" &> /dev/null
+else
+    grep "agent=" "${TEMP}/output.txt" &> /dev/null
+fi
+[[ -d "${TEMP}/repos/lol.git" ]]
+[[ -h "${TEMP}/repos/lol.git/hooks/pre-receive" ]]
+[[ "$(readlink "${TEMP}/repos/lol.git/hooks/pre-receive")" == "${SELF}" ]]
+[[ -h "${TEMP}/repos/lol.git/hooks/post-receive" ]]
+[[ "$(readlink "${TEMP}/repos/lol.git/hooks/post-receive")" == "${SELF}" ]]
+
+cat > "${TEMP}/tmp.txt" <<EOF
+blob
+mark :1
+data 4
+bar
+
+reset refs/heads/master
+commit refs/heads/master
+mark :2
+author Rafael G. Martins <rafael@rafaelmartins.eng.br> 1476033730 +0200
+committer Rafael G. Martins <rafael@rafaelmartins.eng.br> 1476033888 +0200
+data 11
+testing...
+M 100644 :1 foo
+
+EOF
+cd "${TEMP}/repos/lol.git"
+git fast-import < "${TEMP}/tmp.txt" &> /dev/null
+cd - > /dev/null
+
+echo 0000 | call_bgr -c "git-upload-pack 'lol.git'" 2>&1 > "${TEMP}/output.txt"
+if [[ -n "${VALGRIND}" ]]; then
+    grep "git-shell -c \"git-upload-pack '.*repos/lol.git'\"" "${TEMP}/output.txt" &> /dev/null
+else
+    grep "agent=" "${TEMP}/output.txt" &> /dev/null
+fi
+
+echo 0000 | call_bgr -c "git-upload-archive 'lol.git'" 2>&1 > "${TEMP}/output.txt" || true
+if [[ -n "${VALGRIND}" ]]; then
+    grep "git-shell -c \"git-upload-archive '.*repos/lol.git'\"" "${TEMP}/output.txt" &> /dev/null
+else
+    grep "ACK" "${TEMP}/output.txt" &> /dev/null
+fi
+
+rm "${TEMP}/output.txt"
-- 
cgit v1.2.3-18-g5258