From a177eb8c16c96b4be86e2b18857d8ee37dc8d10e Mon Sep 17 00:00:00 2001 From: ridiculousfish Date: Thu, 30 Oct 2014 21:51:23 -0700 Subject: Fix expansion tests on OS X --- tests/expansion.in | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'tests/expansion.in') diff --git a/tests/expansion.in b/tests/expansion.in index 34662d48..aab2b002 100644 --- a/tests/expansion.in +++ b/tests/expansion.in @@ -82,7 +82,13 @@ echo ()[1] echo ()[d] # Test tilde expansion -set tmpdir (mktemp -d) +# On OS X, we must pass an argument to mktemp, +# and /tmp is symlinked to /private/tmp +# $PWD is our best bet for resolving it +set -l saved $PWD +cd (mktemp -d /tmp/fish_tilde_XXXXXX) +set tmpdir $PWD +cd $saved mkdir $tmpdir/realhome ln -s $tmpdir/realhome $tmpdir/linkhome set expandedtilde (env HOME=$tmpdir/linkhome ../fish -c 'echo ~') -- cgit v1.2.3