From b92462ff2d36ed32aadf3f4b9349ad1222f2e956 Mon Sep 17 00:00:00 2001
From: Daniel Hahler <git@thequod.de>
Date: Fri, 15 Dec 2017 23:15:00 +0100
Subject: [PATCH] tests: simplify ZDOTDIR setup, remove base

This makes it easier to run tests without providing ZDOTDIR.
---
 .travis.yml                               | 4 ++--
 Makefile                                  | 4 ++--
 tests/ZDOTDIR.clobber/.zshenv             | 3 ---
 tests/ZDOTDIR.invalid-module_path/.zshenv | 3 ---
 tests/ZDOTDIR.loadviafunction/.zshenv     | 3 ---
 tests/ZDOTDIR.shwordsplit/.zshenv         | 4 ----
 tests/ZDOTDIR/.zshenv                     | 3 ---
 tests/setup.zsh                           | 5 ++++-
 8 files changed, 8 insertions(+), 21 deletions(-)
 delete mode 100644 tests/ZDOTDIR.shwordsplit/.zshenv
 delete mode 100644 tests/ZDOTDIR/.zshenv

diff --git a/.travis.yml b/.travis.yml
index 9836688..faf7d6b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,12 +1,12 @@
 language: generic
 sudo: false
 env:
-  - ZSH=4 ZDOTDIR=tests/ZDOTDIR
+  - ZSH=4
   - ZSH=4 ZDOTDIR=tests/ZDOTDIR.clobber
   - ZSH=4 ZDOTDIR=tests/ZDOTDIR.invalid-module_path
   - ZSH=4 ZDOTDIR=tests/ZDOTDIR.loadviafunction
 
-  - ZSH=5 ZDOTDIR=tests/ZDOTDIR
+  - ZSH=5
   - ZSH=5 ZDOTDIR=tests/ZDOTDIR.clobber
   - ZSH=5 ZDOTDIR=tests/ZDOTDIR.invalid-module_path
   - ZSH=5 ZDOTDIR=tests/ZDOTDIR.loadviafunction
diff --git a/Makefile b/Makefile
index f398f88..4b6c77e 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
-# Default, can be overridden using "make test ZDOTDIR=...".
-ZDOTDIR:=${CURDIR}/tests/ZDOTDIR
+# Empty by default, can be overridden using "make test ZDOTDIR=…".
+ZDOTDIR:=
 # Make it absolute.
 override ZDOTDIR:=$(abspath $(ZDOTDIR))
 
diff --git a/tests/ZDOTDIR.clobber/.zshenv b/tests/ZDOTDIR.clobber/.zshenv
index 84c8c22..5518101 100644
--- a/tests/ZDOTDIR.clobber/.zshenv
+++ b/tests/ZDOTDIR.clobber/.zshenv
@@ -1,4 +1 @@
-# Source base setup.
-source ${ZDOTDIR}/../ZDOTDIR/.zshenv
-
 setopt noclobber
diff --git a/tests/ZDOTDIR.invalid-module_path/.zshenv b/tests/ZDOTDIR.invalid-module_path/.zshenv
index 90f1bd1..ec3e341 100644
--- a/tests/ZDOTDIR.invalid-module_path/.zshenv
+++ b/tests/ZDOTDIR.invalid-module_path/.zshenv
@@ -9,6 +9,3 @@ module_path=(/dev/null)
 zstat() {
   echo "Should not get called."
 }
-
-# Source base setup.
-source ${ZDOTDIR}/../ZDOTDIR/.zshenv
diff --git a/tests/ZDOTDIR.loadviafunction/.zshenv b/tests/ZDOTDIR.loadviafunction/.zshenv
index 9ff2371..7282797 100644
--- a/tests/ZDOTDIR.loadviafunction/.zshenv
+++ b/tests/ZDOTDIR.loadviafunction/.zshenv
@@ -1,6 +1,3 @@
-# Source base setup.
-source ${ZDOTDIR}/../ZDOTDIR/.zshenv
-
 antigen-like-loader-function() {
   source "$TESTDIR/../autoenv.plugin.zsh"
 }
diff --git a/tests/ZDOTDIR.shwordsplit/.zshenv b/tests/ZDOTDIR.shwordsplit/.zshenv
deleted file mode 100644
index f0394b2..0000000
--- a/tests/ZDOTDIR.shwordsplit/.zshenv
+++ /dev/null
@@ -1,4 +0,0 @@
-# Source base setup.
-source ${ZDOTDIR}/../ZDOTDIR/.zshenv
-
-setopt shwordsplit
diff --git a/tests/ZDOTDIR/.zshenv b/tests/ZDOTDIR/.zshenv
deleted file mode 100644
index d99243d..0000000
--- a/tests/ZDOTDIR/.zshenv
+++ /dev/null
@@ -1,3 +0,0 @@
-# Base setup/config.
-
-TEST_SOURCE_AUTOENV=(source $TESTDIR/../autoenv.plugin.zsh)
diff --git a/tests/setup.zsh b/tests/setup.zsh
index 9b24765..9b15bf1 100644
--- a/tests/setup.zsh
+++ b/tests/setup.zsh
@@ -15,7 +15,10 @@ export AUTOENV_AUTH_FILE="$CRAMTMP/autoenv/.autoenv_auth"
 _save_errexit=${options[errexit]}
 set -e
 
-# Defined in .zshenv, e.g. tests/ZDOTDIR/.zshenv.
+# Can be defined in .zshenv, e.g. tests/ZDOTDIR.loadviafunction/.zshenv.
+if [[ -z $TEST_SOURCE_AUTOENV ]]; then
+  TEST_SOURCE_AUTOENV=(source $TESTDIR/../autoenv.plugin.zsh)
+fi
 $TEST_SOURCE_AUTOENV
 
 # Reset any authentication.