From efa9d5dd6a1a4f90e5a6d9372cddf539634be27e Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Tue, 31 Dec 2019 14:16:20 -0800
Subject: [PATCH] Port cd tests to littlecheck

---
 tests/cd.err         |  18 ------
 tests/cd.in          | 115 --------------------------------
 tests/cd.out         |  39 -----------
 tests/checks/cd.fish | 151 ++++++++++++++++++++++++++++++++++++++++++-
 4 files changed, 148 insertions(+), 175 deletions(-)
 delete mode 100644 tests/cd.err
 delete mode 100644 tests/cd.in
 delete mode 100644 tests/cd.out

diff --git a/tests/cd.err b/tests/cd.err
deleted file mode 100644
index ebc6ea138..000000000
--- a/tests/cd.err
+++ /dev/null
@@ -1,18 +0,0 @@
-
-####################
-# cd symlink non-resolution
-
-####################
-# cd symlink completion
-
-####################
-# Virtual PWD inheritance
-
-####################
-# CDPATH
-
-####################
-# on-variable PWD
-
-####################
-# cd concurrency
diff --git a/tests/cd.in b/tests/cd.in
deleted file mode 100644
index 1e84835fc..000000000
--- a/tests/cd.in
+++ /dev/null
@@ -1,115 +0,0 @@
-# Store pwd to later go back before cleaning up
-set -l oldpwd (pwd)
-# Create a test directory to store our stuff.
-set -l base /tmp/cdcomp_test
-rm -Rf $base
-mkdir -p $base
-logmsg cd symlink non-resolution
-set real (mktemp -d)
-set link $base/link
-ln -s $real $link
-cd $link
-prevd
-nextd
-test "$PWD" = "$link" || echo "\$PWD != \$link:"\n   "\$PWD: $PWD"\n   "\$link: $link"\n
-test (pwd) = "$link" || echo "(pwd) != \$link:"\n   "\$PWD: "(pwd)\n   "\$link: $link"\n
-test (pwd -P) = "$real" || echo "(pwd -P) != \$real:"\n   "\$PWD: $PWD"\n   "\$real: $real"\n
-test (pwd -P -L) = "$link" || echo "(pwd -P -L) != \$link:"\n   "\$PWD: $PWD"\n   "\$link: $link"\n
-
-logmsg cd symlink completion
-
-# Create a symlink and verify logical completion.
-# create directory $base/through/the/looking/glass
-# symlink $base/somewhere/teleport -> $base/through/the/looking/glass
-# verify that .. completions work
-cd $base
-mkdir -p $base/through/the/looking/glass
-
-mkdir -p $base/somewhere
-mkdir $base/somewhere/a1
-mkdir $base/somewhere/a2
-mkdir $base/somewhere/a3
-touch $base/through/the/looking/b(seq 1 3)
-mkdir $base/through/the/looking/d1
-mkdir $base/through/the/looking/d2
-mkdir $base/through/the/looking/d3
-ln -s $base/through/the/looking/glass $base/somewhere/rabbithole
-
-cd $base/somewhere/rabbithole
-echo "ls:"
-complete -C'ls ../'
-echo "cd:"
-complete -C'cd ../'
-
-logmsg Virtual PWD inheritance
-# PWD should be imported and respected by fish
-
-cd $oldpwd
-mkdir -p $base/realhome
-set fish_path $PWD/../test/root/bin/fish
-ln -s $base/realhome $base/linkhome
-cd $base/linkhome
-set -l real_getcwd (pwd -P)
-env HOME=$base/linkhome $fish_path -c 'echo PWD is $PWD'
-
-# Do not inherit a virtual PWD that fails to resolve to getcwd (#5647)
-
-env HOME=$base/linkhome PWD=/tmp $fish_path -c 'echo $PWD' | read output_pwd
-test (realpath $output_pwd) = $real_getcwd
-and echo "BogusPWD test 1 succeeded"
-or echo "BogusPWD test 1 failed: $output_pwd vs $real_getcwd"
-
-env HOME=$base/linkhome PWD=/path/to/nowhere $fish_path -c 'echo $PWD' | read output_pwd
-test (realpath $output_pwd) = $real_getcwd
-and echo "BogusPWD test 2 succeeded"
-or echo "BogusPWD test 2 failed: $output_pwd vs $real_getcwd"
-
-# $CDPATH
-logmsg CDPATH
-set -g CDPATH $base
-cd linkhome
-test $PWD = $base/linkhome; and echo Gone to linkhome via CDPATH
-set -g CDPATH /tmp
-cd $base
-test $PWD = $base; and echo Gone to base
-cd linkhome
-test $PWD = $base/linkhome; and echo Gone to linkhome via implicit . in CDPATH
-set -g CDPATH ./
-cd $base
-test $PWD = $base; and echo No crash with ./ CDPATH
-
-# test for directories beginning with a hyphen
-mkdir $base/-testdir
-cd $base
-cd -- -testdir
-test $PWD = $base/-testdir
-
-# cd back before removing the test directory again.
-cd $oldpwd
-rm -Rf $base
-
-logmsg on-variable PWD
-# Verify that PWD on-variable events are sent
-function __fish_test_changed_pwd --on-variable PWD
-   echo "Changed to $PWD"
-end
-cd /
-functions --erase __fish_test_changed_pwd
-
-logmsg cd concurrency
-# Verify that cds don't stomp on each other.
-function __fish_test_thrash_cd
-   set -l dir (mktemp -d)
-   cd $dir
-   for i in (seq 50)
-       test (/bin/pwd) = $dir
-       and test $PWD = $dir
-       or echo "cd test failed" 1>&2
-       sleep .002
-   end
-end
-__fish_test_thrash_cd |
-__fish_test_thrash_cd |
-__fish_test_thrash_cd |
-__fish_test_thrash_cd |
-__fish_test_thrash_cd
diff --git a/tests/cd.out b/tests/cd.out
deleted file mode 100644
index d6098ed9d..000000000
--- a/tests/cd.out
+++ /dev/null
@@ -1,39 +0,0 @@
-
-####################
-# cd symlink non-resolution
-
-####################
-# cd symlink completion
-ls:
-../b1
-../b2
-../b3
-../d1/
-../d2/
-../d3/
-../glass/
-cd:
-../a1/
-../a2/
-../a3/
-../rabbithole/
-
-####################
-# Virtual PWD inheritance
-PWD is /tmp/cdcomp_test/linkhome
-BogusPWD test 1 succeeded
-BogusPWD test 2 succeeded
-
-####################
-# CDPATH
-Gone to linkhome via CDPATH
-Gone to base
-Gone to linkhome via implicit . in CDPATH
-No crash with ./ CDPATH
-
-####################
-# on-variable PWD
-Changed to /
-
-####################
-# cd concurrency
diff --git a/tests/checks/cd.fish b/tests/checks/cd.fish
index 7be303541..3232e11f1 100644
--- a/tests/checks/cd.fish
+++ b/tests/checks/cd.fish
@@ -1,13 +1,158 @@
-# RUN: %fish %s
+# RUN: %fish -C 'set -g fish %fish' %s
+
+set -g fish (realpath $fish)
+
+# Store pwd to later go back before cleaning up
+set -l oldpwd (pwd)
+
 set -l tmp (mktemp -d)
 cd $tmp
 # resolve CDPATH (issue 6220)
 begin
     mkdir -p x
     # CHECK: /{{.*}}/x
-    cd x; pwd
+    cd x
+    pwd
 
     # CHECK: /{{.*}}/x
-    set -lx CDPATH ..; cd x; pwd
+    set -lx CDPATH ..
+    cd x
+    pwd
 end
 rm -rf $tmp
+cd $oldpwd
+
+# Create a test directory to store our stuff.
+set -l base /tmp/cdcomp_test
+rm -Rf $base
+mkdir -p $base
+set real (mktemp -d)
+set link $base/link
+ln -s $real $link
+cd $link
+prevd
+nextd
+test "$PWD" = "$link" || echo "\$PWD != \$link:"\n "\$PWD: $PWD"\n "\$link: $link"\n
+test (pwd) = "$link" || echo "(pwd) != \$link:"\n "\$PWD: "(pwd)\n "\$link: $link"\n
+test (pwd -P) = "$real" || echo "(pwd -P) != \$real:"\n "\$PWD: $PWD"\n "\$real: $real"\n
+test (pwd -P -L) = "$link" || echo "(pwd -P -L) != \$link:"\n "\$PWD: $PWD"\n "\$link: $link"\n
+# Expect no output on success.
+
+# Create a symlink and verify logical completion.
+# create directory $base/through/the/looking/glass
+# symlink $base/somewhere/teleport -> $base/through/the/looking/glass
+# verify that .. completions work
+cd $base
+mkdir -p $base/through/the/looking/glass
+
+mkdir -p $base/somewhere
+mkdir $base/somewhere/a1
+mkdir $base/somewhere/a2
+mkdir $base/somewhere/a3
+touch $base/through/the/looking/b(seq 1 3)
+mkdir $base/through/the/looking/d1
+mkdir $base/through/the/looking/d2
+mkdir $base/through/the/looking/d3
+ln -s $base/through/the/looking/glass $base/somewhere/rabbithole
+
+cd $base/somewhere/rabbithole
+echo "ls:"
+complete -C'ls ../'
+#CHECK: ls:
+#CHECK: ../b1
+#CHECK: ../b2
+#CHECK: ../b3
+#CHECK: ../d1/
+#CHECK: ../d2/
+#CHECK: ../d3/
+#CHECK: ../glass/
+
+echo "cd:"
+complete -C'cd ../'
+#CHECK: cd:
+#CHECK: ../a1/
+#CHECK: ../a2/
+#CHECK: ../a3/
+#CHECK: ../rabbithole/
+
+
+# PWD should be imported and respected by fish
+cd $oldpwd
+mkdir -p $base/realhome
+ln -s $base/realhome $base/linkhome
+cd $base/linkhome
+set -l real_getcwd (pwd -P)
+env HOME=$base/linkhome $fish -c 'echo PWD is $PWD'
+#CHECK: PWD is /tmp/cdcomp_test/linkhome
+
+
+# Do not inherit a virtual PWD that fails to resolve to getcwd (#5647)
+env HOME=$base/linkhome PWD=/tmp $fish -c 'echo $PWD' | read output_pwd
+test (realpath $output_pwd) = $real_getcwd
+and echo "BogusPWD test 1 succeeded"
+or echo "BogusPWD test 1 failed: $output_pwd vs $real_getcwd"
+#CHECK: BogusPWD test 1 succeeded
+
+env HOME=$base/linkhome PWD=/path/to/nowhere $fish -c 'echo $PWD' | read output_pwd
+test (realpath $output_pwd) = $real_getcwd
+and echo "BogusPWD test 2 succeeded"
+or echo "BogusPWD test 2 failed: $output_pwd vs $real_getcwd"
+#CHECK: BogusPWD test 2 succeeded
+
+# $CDPATH
+set -g CDPATH $base
+cd linkhome
+test $PWD = $base/linkhome; and echo Gone to linkhome via CDPATH
+#CHECK: Gone to linkhome via CDPATH
+
+set -g CDPATH /tmp
+cd $base
+test $PWD = $base; and echo Gone to base
+#CHECK: Gone to base
+
+cd linkhome
+test $PWD = $base/linkhome; and echo Gone to linkhome via implicit . in CDPATH
+#CHECK: Gone to linkhome via implicit . in CDPATH
+
+set -g CDPATH ./
+cd $base
+test $PWD = $base; and echo No crash with ./ CDPATH
+#CHECK: No crash with ./ CDPATH
+
+# test for directories beginning with a hyphen
+mkdir $base/-testdir
+cd $base
+cd -- -testdir
+test $PWD = $base/-testdir
+echo $status
+#CHECK: 0
+
+
+# cd back before removing the test directory again.
+cd $oldpwd
+rm -Rf $base
+
+# Verify that PWD on-variable events are sent
+function __fish_test_changed_pwd --on-variable PWD
+    echo "Changed to $PWD"
+end
+cd /
+functions --erase __fish_test_changed_pwd
+#CHECK: Changed to /
+
+# Verify that cds don't stomp on each other.
+function __fish_test_thrash_cd
+    set -l dir (mktemp -d)
+    cd $dir
+    for i in (seq 50)
+        test (/bin/pwd) = $dir
+        and test $PWD = $dir
+        or echo "cd test failed" 1>&2
+        sleep .002
+    end
+end
+__fish_test_thrash_cd |
+__fish_test_thrash_cd |
+__fish_test_thrash_cd |
+__fish_test_thrash_cd |
+__fish_test_thrash_cd