Skip to content

Commit 8a5d916

Browse files
authored
Merge pull request #3278 from sp1ff/master
Make BASE_WORKDIR configurable in tests/acceptance/testall
2 parents cea2a2d + 974eede commit 8a5d916

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

tests/acceptance/testall

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ INOTIFYWAIT_OPTS="-r -m -e modify -e attrib -e moved_to -e create -e delete -e d
7171
SUMMARY=summary.log
7272
XML=test.xml
7373
WHOAMI=/c/Windows/System32/whoami.exe
74-
BASE_WORKDIR="$(pwd)/workdir"
74+
BASE_WORKDIR=${BASE_WORKDIR:-$(pwd)/workdir}
7575
QUIET=
7676

7777
# Default test types to run if --tests= is not passed
@@ -261,6 +261,7 @@ usage() {
261261
echo " --inotifywait Run tests and log filesystem events"
262262
echo " --no-clean does not clean workdir after test finishes"
263263
echo " (by default it gets cleaned only if test passed)."
264+
echo " --base-workdir Specify a local directory for all working files"
264265
echo " -j[n]"
265266
echo " -jobs=[n] Run tests in parallel, works like make -j option. Note that some"
266267
echo " tests will always run one by one."
@@ -822,6 +823,8 @@ do
822823
# Internal option. Meant to keep sub invocations from interfering by
823824
# writing files only into the workdir.
824825
STAY_IN_WORKDIR=1;;
826+
--base-workdir=*)
827+
BASE_WORKDIR="${1#--base-workdir=}";;
825828
-*)
826829
echo "Unknown option: $1"
827830
exit 1;;

0 commit comments

Comments
 (0)