Merge pull request #607 from martin-schulze-vireso/fix/issue_605_doub…

…le_slashes_in_paths

Fix // in some paths and add regression test

docs/CHANGELOG.md

@@ -28,6 +28,7 @@ The format is based on [Keep a Changelog][kac] and this project adheres to
 * allow `--gather-test-outputs-in <directory>` to work with existing, empty
   directories (#603)
   * also add `--clean-and-gather-test-outpust-in <directory>` for improved UX
+* double slashes in paths derived from TMPDIR on MacOS (#607)
 
 #### Documentation
 

libexec/bats-core/bats

@@ -94,6 +94,7 @@ export BATS_TEST_FILTER=
 export PATH="$BATS_LIBEXEC:$PATH"
 export BATS_ROOT_PID=$$
 export BATS_TMPDIR="${TMPDIR:-/tmp}"
+BATS_TMPDIR=${BATS_TMPDIR%/} # chop off trailing / to avoid duplication
 export BATS_RUN_TMPDIR=
 export BATS_GUARANTEED_MINIMUM_VERSION=0.0.0
 

libexec/bats-core/bats-exec-test

@@ -70,7 +70,7 @@ elif [[ ! -f "$BATS_TEST_FILENAME" ]]; then
 fi
 
 bats_create_test_tmpdirs() {
-  local tests_tmpdir="${BATS_RUN_TMPDIR}/test/"
+  local tests_tmpdir="${BATS_RUN_TMPDIR}/test"
   if ! mkdir -p "$tests_tmpdir"; then
     printf 'Failed to create: %s\n' "$tests_tmpdir" >&2
     exit 1

test/bats.bats

@@ -1228,4 +1228,8 @@ END_OF_ERR_MSG
   TEARDOWN_RETURN_CODE=1 TEST_RETURN_CODE=1 STATUS=0 run -1 bats "$FIXTURE_ROOT/teardown_suite_override_status/"
   TEARDOWN_RETURN_CODE=0 TEST_RETURN_CODE=0 STATUS=1 run -0 bats "$FIXTURE_ROOT/teardown_suite_override_status/"
   TEARDOWN_RETURN_CODE=1 TEST_RETURN_CODE=0 STATUS=1 run -1 bats "$FIXTURE_ROOT/teardown_suite_override_status/"
+}
+
+@test "BATS_* variables don't contain double slashes" {
+  TMPDIR=/tmp/ bats "$FIXTURE_ROOT/BATS_variables_dont_contain_double_slashes.bats"
 }

test/fixtures/bats/BATS_variables_dont_contain_double_slashes.bats

@@ -0,0 +1,9 @@
+@test "BATS_* variables don't contain double slashes" {
+  for var_name in ${!BATS_@}; do
+    local var_value="${!var_name}"
+    if [[ "$var_value" == *'//'* ]]; then
+
+      echo "$var_name contains // ${#var_value}: ${var_value}" && false
+    fi
+  done
+}