Merge commit 'b4c3277f72f995cc0babcdc5bc6f6d0e2254acc3' into felipec

These changes can be merged with limited conflict resolution.

.github/workflows/main.yml

@@ -1,6 +1,5 @@
 on:
   push:
-    branches: [ master ]
 
 jobs:
   test:

test/Makefile

@@ -1,9 +1,9 @@
 RM ?= rm -f
 
 T = main.t main-push.t bidi.t helper.t
-TEST_DIRECTORY := $(CURDIR)
+SHARNESS_TEST_DIRECTORY := $(CURDIR)
 
-export TEST_DIRECTORY
+export SHARNESS_TEST_DIRECTORY
 
 all: test
 

test/bidi.t

@@ -8,8 +8,7 @@
 
 test_description='Test bidirectionality of remote-hg'
 
-test -n "$TEST_DIRECTORY" || TEST_DIRECTORY=$(dirname $0)/
-. "$TEST_DIRECTORY"/test-lib.sh
+. ./test-lib.sh
 
 if ! test_have_prereq PYTHON
 then

test/hg-git.t

@@ -8,8 +8,7 @@
 
 test_description='Test remote-hg output compared to hg-git'
 
-test -n "$TEST_DIRECTORY" || TEST_DIRECTORY=$(dirname $0)/
-. "$TEST_DIRECTORY"/test-lib.sh
+. ./test-lib.sh
 
 if ! test_have_prereq PYTHON
 then

test/main.t

@@ -8,8 +8,7 @@
 
 test_description='Test remote-hg'
 
-test -n "$TEST_DIRECTORY" || TEST_DIRECTORY=$(dirname $0)/
-. "$TEST_DIRECTORY"/test-lib.sh
+. ./test-lib.sh
 
 if test "$CAPABILITY_PUSH" = "t"
 then

test/test-lib.sh

@@ -1,8 +1,10 @@
 #!/bin/sh
 
+: "${SHARNESS_TEST_SRCDIR:=$(cd "$(dirname "${BASH_SOURCE-$0}")" && pwd)}"
+
 if [ -z "$SHARNESS" ] ; then
 	for d in \
-		"." \
+		"$SHARNESS_TEST_SRCDIR" \
 		"$HOME/share/sharness" \
 		"/usr/local/share/sharness" \
 		"/usr/share/sharness"