Page MenuHomeFreeBSD
Files F154242872

D55153.id.diff
No OneTemporary
Actions

D55153.id.diff
View Options

diff --git a/bin/pwd/Makefile b/bin/pwd/Makefile
--- a/bin/pwd/Makefile
+++ b/bin/pwd/Makefile
@@ -1,4 +1,8 @@
-PACKAGE=runtime
-PROG= pwd
+.include <src.opts.mk>
+
+PACKAGE= runtime
+PROG= pwd
+HAS_TESTS=
+SUBDIR.${MK_TESTS}= tests
.include <bsd.prog.mk>
diff --git a/bin/pwd/tests/Makefile b/bin/pwd/tests/Makefile
new file mode 100644
--- /dev/null
+++ b/bin/pwd/tests/Makefile
@@ -0,0 +1,4 @@
+PACKAGE= tests
+ATF_TESTS_SH= pwd_test
+
+.include <bsd.test.mk>
diff --git a/bin/pwd/tests/pwd_test.sh b/bin/pwd/tests/pwd_test.sh
new file mode 100644
--- /dev/null
+++ b/bin/pwd/tests/pwd_test.sh
@@ -0,0 +1,73 @@
+#
+# Copyright (c) 2026 Dag-Erling Smørgrav
+#
+# SPDX-License-Identifier: BSD-2-Clause
+#
+
+atf_test_case logical
+logical_head()
+{
+ atf_set "descr" "Cases where pwd prints the " \
+ "logical working directory"
+}
+logical_body()
+{
+ root=$(realpath $PWD)
+ atf_check mkdir -p phy/baz
+ atf_check ln -s phy log
+ cd log/baz
+
+ # explicitly request logical
+ export PWD="$root/log/baz"
+ atf_check -o inline:"$root/log/baz\n" pwd -L
+ atf_check -o inline:"$root/log/baz\n" pwd -P -L
+
+ # logical is also the default
+ export PWD="$root/log/baz"
+ atf_check -o inline:"$root/log/baz\n" pwd
+}
+
+atf_test_case physical
+physical_head()
+{
+ atf_set "descr" "Cases where pwd prints the " \
+ "physical working directory"
+}
+physical_body()
+{
+ root=$(realpath $PWD)
+ atf_check mkdir -p phy/baz
+ atf_check ln -s phy log
+ cd log/baz
+
+ # explicitly request physical
+ export PWD="$root/log/baz"
+ atf_check -o inline:"$root/phy/baz\n" pwd -P
+ atf_check -o inline:"$root/phy/baz\n" pwd -L -P
+
+ # request logical but $PWD is relative
+ export PWD="log/baz"
+ atf_check -o inline:"$root/phy/baz\n" pwd -L
+
+ # request logical but $PWD contains dot
+ export PWD="$root/log/./baz"
+ atf_check -o inline:"$root/phy/baz\n" pwd -L
+
+ # request logical but $PWD contains dot-dot
+ export PWD="$root/log/../log/baz"
+ atf_check -o inline:"$root/phy/baz\n" pwd -L
+
+ # request logical but $PWD does not exist
+ export PWD="$root/baz"
+ atf_check -o inline:"$root/phy/baz\n" pwd -L
+
+ # request logical but $PWD does not match
+ export PWD="$root/log"
+ atf_check -o inline:"$root/phy/baz\n" pwd -L
+}
+
+atf_init_test_cases()
+{
+ atf_add_test_case logical
+ atf_add_test_case physical
+}
diff --git a/etc/mtree/BSD.tests.dist b/etc/mtree/BSD.tests.dist
--- a/etc/mtree/BSD.tests.dist
+++ b/etc/mtree/BSD.tests.dist
@@ -49,6 +49,8 @@
..
pwait
..
+ pwd
+ ..
rm
..
rmdir

File Metadata

Mime Type
text/plain
Expires
Tue, Apr 28, 8:57 AM (7 h, 13 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
32263701
Default Alt Text
D55153.id.diff (2 KB)

Event Timeline