summaryrefslogtreecommitdiffabout
authorSergey Poznyakoff <gray@gnu.org.ua>2017-06-07 09:05:19 (GMT)
committer Sergey Poznyakoff <gray@gnu.org.ua>2017-06-07 10:06:17 (GMT)
commit453cd17f7a4be5ceaa8411a8a3ebd9fddd88df8e (patch) (side-by-side diff)
tree3c919d804a8df24c01bc26854bcec4e0c5db21b6
parent491bec23a77b19df8b9c0442696ce57e3fc5c604 (diff)
downloadmailutils-453cd17f7a4be5ceaa8411a8a3ebd9fddd88df8e.tar.gz
mailutils-453cd17f7a4be5ceaa8411a8a3ebd9fddd88df8e.tar.bz2
Fix tests when logical and physical CWD differ
MH testsuite produced false negatives when run in a directory accessed by its logical name (symlink). To fix this, avoiding at the same time the use of non-portable "pwd -P" & "pwd -L", this commit adds a filter utility that replaces both logical and physical cwd with a dot on output. The MH testsuite is updated to use this utility. * testsuite/cwdrepl.c: New utility * testsuite/Makefile.am: Build cwdrepl * testsuite/.gitignore: Update. * testsuite/cwdrepl.at: New test. * testsuite/testsuite.at: Include new test. * mh/tests/atlocal.in (PATH): Add testsuite (remove_curdir): Remove function. * mh/tests/comp.at: Use cwdrepl, fix expected output. * mh/tests/forw.at: Likewise. * mh/tests/mhn.at: Likewise. * mh/tests/mhpath.at: Likewise. * mh/tests/repl.at: Likewise.
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--mh/tests/atlocal.in6
-rw-r--r--mh/tests/comp.at34
-rw-r--r--mh/tests/forw.at38
-rw-r--r--mh/tests/mhn.at38
-rw-r--r--mh/tests/mhpath.at30
-rw-r--r--mh/tests/repl.at12
-rw-r--r--testsuite/.gitignore1
-rw-r--r--testsuite/Makefile.am4
-rw-r--r--testsuite/cwdrepl.at59
-rw-r--r--testsuite/cwdrepl.c176
-rw-r--r--testsuite/testsuite.at1
11 files changed, 319 insertions, 80 deletions
diff --git a/mh/tests/atlocal.in b/mh/tests/atlocal.in
index 508e03f..6a7f405 100644
--- a/mh/tests/atlocal.in
+++ b/mh/tests/atlocal.in
@@ -3,10 +3,8 @@
# Copyright (C) 2004, 2010-2012, 2014-2017 Free Software Foundation,
# Inc.
-PATH=@abs_builddir@:@abs_top_builddir@/mh:$top_srcdir:$srcdir:$PATH
-remove_curdir() {
- sed "s|$HOME/*||;s| *$||" $*
-}
+PATH=@abs_builddir@:@abs_top_builddir@/testsuite:@abs_top_builddir@/mh:$top_srcdir:$srcdir:$PATH
+
# mimeflt [FILE]
# Filter out all variable information from a MIME message in FILE.
# If FILE is not given, filter stdin.
diff --git a/mh/tests/comp.at b/mh/tests/comp.at
index a8d4a41..563310c 100644
--- a/mh/tests/comp.at
+++ b/mh/tests/comp.at
@@ -19,7 +19,7 @@ m4_pushdef([MH_KEYWORDS],[comp])
m4_pushdef([compcmd],[comp -editor $abs_top_srcdir/mh/tests/mhed])
MH_CHECK([comp -file],[comp00 comp-file],[
-echo quit | compcmd -file ./infile | remove_curdir | sed 's/ *$//'
+echo quit | compcmd -file $HOME/infile | cwdrepl | sed 's/ *$//'
sed 's/ *$//' infile
],
[0],
@@ -39,7 +39,7 @@ Seen by mhed
])
MH_CHECK([comp -file (del)],[comp01 comp-file_del],[
-echo 'quit -delete' | compcmd -file ./infile | remove_curdir
+echo 'quit -delete' | compcmd -file $HOME/infile | cwdrepl | sed 's/ *$//'
],
[0],
[-- Editor invocation: ./infile
@@ -53,18 +53,18 @@ What now?
])
MH_CHECK([comp file],[comp02 comp_file],[
-echo 'quit' | compcmd file | remove_curdir | sed 's/ *$//'
+echo 'quit' | compcmd file | cwdrepl | sed 's/ *$//'
sed 's/ *$//' Mail/file
],
[0],
-[-- Editor invocation: Mail/file
+[-- Editor invocation: ./Mail/file
-- Input file:
To:
cc:
Subject:
--------
-- Input file end
-What now? draft left on "Mail/file".
+What now? draft left on "./Mail/file".
To:
cc:
Subject:
@@ -80,11 +80,11 @@ Subject: test input
message body
])
-echo 'quit' | compcmd -use file | remove_curdir | sed 's/ *$//'
+echo 'quit' | compcmd -use file | cwdrepl | sed 's/ *$//'
sed 's/ *$//' Mail/file
],
[0],
-[-- Editor invocation: Mail/file
+[-- Editor invocation: ./Mail/file
-- Input file:
From: gray
To: root
@@ -92,7 +92,7 @@ Subject: test input
message body
-- Input file end
-What now? draft left on "Mail/file".
+What now? draft left on "./Mail/file".
From: gray
To: root
Subject: test input
@@ -110,14 +110,14 @@ Subject: test input
message body
])
-echo 'quit' | compcmd +inbox 1 | remove_curdir | sed 's/ *$//'
+echo 'quit' | compcmd +inbox 1 | cwdrepl | sed 's/ *$//'
echo Mail/draft
sed 's/ *$//' Mail/draft
echo Message
sed 's/ *$//' Mail/inbox/1
],
[0],
-[-- Editor invocation: Mail/draft
+[-- Editor invocation: ./Mail/draft
-- Input file:
From: gray
To: root
@@ -125,7 +125,7 @@ Subject: test input
message body
-- Input file end
-What now? draft left on "Mail/draft".
+What now? draft left on "./Mail/draft".
Mail/draft
From: gray
To: root
@@ -143,18 +143,18 @@ message body
MH_CHECK([comp -draftfolder],[comp05 comp-draftfolder draftfolder],[
mkdir Mail/drafts
-echo 'quit' | compcmd -draftfolder drafts | remove_curdir | sed 's/ *$//'
+echo 'quit' | compcmd -draftfolder drafts | cwdrepl | sed 's/ *$//'
sed 's/ *$//' Mail/drafts/1
],
[0],
-[-- Editor invocation: Mail/drafts/1
+[-- Editor invocation: ./Mail/drafts/1
-- Input file:
To:
cc:
Subject:
--------
-- Input file end
-What now? draft left on "Mail/drafts/1".
+What now? draft left on "./Mail/drafts/1".
To:
cc:
Subject:
@@ -172,11 +172,11 @@ message body
])
echo "cur: 1" > Mail/drafts/.mh_sequences
-echo 'quit' | compcmd -draftfolder drafts -use| remove_curdir | sed 's/ *$//'
+echo 'quit' | compcmd -draftfolder drafts -use| cwdrepl | sed 's/ *$//'
sed 's/ *$//' Mail/drafts/1
],
[0],
-[-- Editor invocation: Mail/drafts/1
+[-- Editor invocation: ./Mail/drafts/1
-- Input file:
From: gray
To: root
@@ -184,7 +184,7 @@ Subject: test input
message body
-- Input file end
-What now? draft left on "Mail/drafts/1".
+What now? draft left on "./Mail/drafts/1".
From: gray
To: root
Subject: test input
diff --git a/mh/tests/forw.at b/mh/tests/forw.at
index 4392fa2..e0566df 100644
--- a/mh/tests/forw.at
+++ b/mh/tests/forw.at
@@ -27,7 +27,7 @@ Subject: test input
message body
])
-echo quit | forwcmd +inbox 1 | remove_curdir
+echo quit | forwcmd +inbox 1 | cwdrepl
echo == Mail/draft ==
cat Mail/draft
echo == Message ==
@@ -36,7 +36,7 @@ echo == Message ==
sed '/^X-IMAPbase/d' Mail/inbox/1
],
[0],
-[-- Editor invocation: Mail/draft
+[-- Editor invocation: ./Mail/draft
-- Input file:
To:
cc:
@@ -53,7 +53,7 @@ message body
------- End of Forwarded message
-- Input file end
-What now? draft left on "Mail/draft".
+What now? draft left on "./Mail/draft".
== Mail/draft ==
To:
cc:
@@ -87,7 +87,7 @@ Subject: test input
message body
])
-echo quit | forwcmd -format +inbox 1 | remove_curdir
+echo quit | forwcmd -format +inbox 1 | cwdrepl
echo == Mail/draft ==
cat Mail/draft
echo == Message ==
@@ -96,7 +96,7 @@ echo == Message ==
sed '/^X-IMAPbase/d' Mail/inbox/1
],
[0],
-[-- Editor invocation: Mail/draft
+[-- Editor invocation: ./Mail/draft
-- Input file:
To:
cc:
@@ -113,7 +113,7 @@ message body
------- End of Forwarded message
-- Input file end
-What now? draft left on "Mail/draft".
+What now? draft left on "./Mail/draft".
== Mail/draft ==
To:
cc:
@@ -153,7 +153,7 @@ Subject: 2nd message
2nd message body
])
-echo quit | forwcmd +inbox 1 2 | remove_curdir
+echo quit | forwcmd +inbox 1 2 | cwdrepl
echo == Mail/draft ==
cat Mail/draft
echo == Message 1 ==
@@ -162,7 +162,7 @@ echo == Message 2 ==
cat Mail/inbox/2
],
[0],
-[-- Editor invocation: Mail/draft
+[-- Editor invocation: ./Mail/draft
-- Input file:
To:
cc:
@@ -188,7 +188,7 @@ Subject: 2nd message
------- End of Forwarded messages
-- Input file end
-What now? draft left on "Mail/draft".
+What now? draft left on "./Mail/draft".
== Mail/draft ==
To:
cc:
@@ -237,7 +237,7 @@ Subject: test input
message body
])
-forwcmd -build +inbox 1 | remove_curdir
+forwcmd -build +inbox 1 | cwdrepl
echo == Mail/draft ==
cat Mail/draft
echo == Message ==
@@ -282,9 +282,9 @@ Subject: 2nd message
2nd message body
])
-forwcmd -build -mime +inbox 1 2 | remove_curdir
+forwcmd -build -mime +inbox 1 2 | cwdrepl
echo == Mail/draft ==
-remove_curdir Mail/draft
+cwdrepl < Mail/draft
echo == Message 1 ==
sed '/^X-IMAPbase/d' Mail/inbox/1
echo == Message 2 ==
@@ -296,7 +296,7 @@ To:
cc:
Subject:
--------
-#forw [] +Mail/inbox 1 2
+#forw [] +./Mail/inbox 1 2
== Message 1 ==
From: gray
@@ -322,14 +322,14 @@ Subject: test input
message body
])
-echo "quit" | forwcmd -draftfolder drafts 1 | remove_curdir
+echo "quit" | forwcmd -draftfolder drafts 1 | cwdrepl
echo == Mail/drafts/1 ==
cat Mail/drafts/1
echo == Message ==
sed '/^X-IMAPbase/d' Mail/inbox/1
],
[0],
-[-- Editor invocation: Mail/drafts/1
+[-- Editor invocation: ./Mail/drafts/1
-- Input file:
To:
cc:
@@ -346,7 +346,7 @@ message body
------- End of Forwarded message
-- Input file end
-What now? draft left on "Mail/drafts/1".
+What now? draft left on "./Mail/drafts/1".
== Mail/drafts/1 ==
To:
cc:
@@ -379,10 +379,10 @@ Subject: test input
message body
])
-echo "quit" | forwcmd -file infile | remove_curdir
+echo "quit" | forwcmd -file infile | cwdrepl
],
[0],
-[-- Editor invocation: Mail/draft
+[-- Editor invocation: ./Mail/draft
-- Input file:
To:
cc:
@@ -394,7 +394,7 @@ Subject: test input
message body
-- Input file end
-What now? draft left on "Mail/draft".
+What now? draft left on "./Mail/draft".
])
m4_popdef([forwcmd])
diff --git a/mh/tests/mhn.at b/mh/tests/mhn.at
index 51d579a..30755ec 100644
--- a/mh/tests/mhn.at
+++ b/mh/tests/mhn.at
@@ -130,21 +130,21 @@ Be off, or I'll kick you down stairs!'
MH_CHECK([mhn -store -auto],[mhn03 mhn-store-auto],[
MUT_MBCOPY($abs_top_srcdir/testsuite/mh/mbox1,[Mail/inbox])
-mhn +inbox -store -auto 4 | remove_curdir || exit $?
+mhn +inbox -store -auto 4 | cwdrepl || exit $?
],
[0],
-[storing message 4 part 1 as file msg.21
-storing message 4 part 2.1 as file msg.22
-storing message 4 part 2.2.1 as file msg.23
-storing message 4 part 2.2.2 as file msg.24
+[storing message 4 part 1 as file ./msg.21
+storing message 4 part 2.1 as file ./msg.22
+storing message 4 part 2.2.1 as file ./msg.23
+storing message 4 part 2.2.2 as file ./msg.24
])
MH_CHECK([mhn -store -auto -part],[mhn04 mhn-store-auto-part],[
MUT_MBCOPY($abs_top_srcdir/testsuite/mh/mbox1,[Mail/inbox],[700])
-mhn +inbox -store -auto -part 2.2.1 4 | remove_curdir || exit $?
+mhn +inbox -store -auto -part 2.2.1 4 | cwdrepl || exit $?
],
[0],
-[storing message 4 part 2.2.1 as file msg.23
+[storing message 4 part 2.2.1 as file ./msg.23
])
MH_CHECK([mhn -store -auto (pathname safety)],[mhn05 mhn-store-auto-safety],[
@@ -178,13 +178,13 @@ MUT_MBCHMOD(Mail/inbox, 700)
mkdir out
echo "mhn-storage: $HOME/out" >> $MH
-mhn +inbox -store 4 | remove_curdir || echo $?
+mhn +inbox -store 4 | cwdrepl || echo $?
],
[0],
-[storing message 4 part 1 as file out/4.1.plain
-storing message 4 part 2.1 as file out/4.2.1.octet-stream
-storing message 4 part 2.2.1 as file out/4.2.2.1.octet-stream
-storing message 4 part 2.2.2 as file out/4.2.2.2.octet-stream
+[storing message 4 part 1 as file ./out/4.1.plain
+storing message 4 part 2.1 as file ./out/4.2.1.octet-stream
+storing message 4 part 2.2.1 as file ./out/4.2.2.1.octet-stream
+storing message 4 part 2.2.2 as file ./out/4.2.2.2.octet-stream
])
MH_CHECK([mhn-store-: all escapes],[mhn07 mhn-store_escapes],[
@@ -193,7 +193,7 @@ cp $abs_top_srcdir/testsuite/mh/mbox1/4 Mail/inbox
MUT_MBCHMOD(Mail/inbox, 700)
echo "mhn-store-application: %%-%m%P.%s-%p" >> $MH
-mhn +inbox -store 4 | remove_curdir || exit $?
+mhn +inbox -store 4 || exit $?
find . -name '%*' | sort
],
[0],
@@ -213,13 +213,13 @@ cp $abs_top_srcdir/testsuite/mh/mbox1/4 Mail/inbox
MUT_MBCHMOD(Mail/inbox, 700)
echo "mhn-store-application: $HOME/out/%m%P.%s" >> $MH
-mhn +inbox -store 4 | remove_curdir || exit $?
+mhn +inbox -store 4 | cwdrepl || exit $?
],
[0],
[storing message 4 part 1 as file 4.1.plain
-storing message 4 part 2.1 as file out/4.2.1.octet-stream
-storing message 4 part 2.2.1 as file out/4.2.2.1.octet-stream
-storing message 4 part 2.2.2 as file out/4.2.2.2.octet-stream
+storing message 4 part 2.1 as file ./out/4.2.1.octet-stream
+storing message 4 part 2.2.1 as file ./out/4.2.2.1.octet-stream
+storing message 4 part 2.2.2 as file ./out/4.2.2.2.octet-stream
])
MH_CHECK([mhn-store-: +folder],[mhn09 mhn-store+folder],[
@@ -229,7 +229,7 @@ cp $abs_top_srcdir/testsuite/mh/mbox1/4 Mail/inbox
MUT_MBCHMOD(Mail, 700)
echo "mhn-store-application: +app" >> $MH
-mhn +inbox -store 4 | remove_curdir || exit $?
+mhn +inbox -store 4 | cwdrepl || exit $?
],
[0],
[storing message 4 part 1 as file 4.1.plain
@@ -247,7 +247,7 @@ echo "Current-Folder: inbox" > Mail/context
cat >> $MH <<EOT
mhn-store-application/octet-stream: +
EOT
-mhn +inbox -store -part 2.2.1 4 | remove_curdir || exit $?
+mhn +inbox -store -part 2.2.1 4 | cwdrepl || exit $?
],
[0],
[storing message 4 part 2.2.1 to folder inbox as message 5
diff --git a/mh/tests/mhpath.at b/mh/tests/mhpath.at
index a048687..d07a7c7 100644
--- a/mh/tests/mhpath.at
+++ b/mh/tests/mhpath.at
@@ -20,43 +20,43 @@ m4_pushdef([MH_KEYWORDS],[mhpath])
MH_CHECK([mhpath],[mhpath00],[
MUT_MBCOPY($abs_top_srcdir/testsuite/mh/mbox1,[Mail/inbox])
echo 'Current-Folder: inbox' > Mail/context
-mhpath | remove_curdir
+mhpath | cwdrepl
],
[0],
-[Mail/inbox
+[./Mail/inbox
])
MH_CHECK([mhpath +],[mhpath01 mhpath+],[
MUT_MBCOPY($abs_top_srcdir/testsuite/mh/mbox1,[Mail/inbox])
echo 'Current-Folder: inbox' > Mail/context
-mhpath +| remove_curdir
+mhpath +| cwdrepl
],
[0],
-[Mail
+[./Mail
])
MH_CHECK([mhpath msgs],[mhpath02 mhparam_msgs],[
MUT_MBCOPY($abs_top_srcdir/testsuite/mh/mbox1,[Mail/inbox])
-mhpath 1-3 | remove_curdir
+mhpath 1-3 | cwdrepl
],
[0],
-[Mail/inbox/1
-Mail/inbox/2
-Mail/inbox/3
+[./Mail/inbox/1
+./Mail/inbox/2
+./Mail/inbox/3
])
MH_CHECK([mhpath msgs (some nonexistent)],[mhpath03 mhparam_msgs_some_nonex],[
MUT_MBCOPY($abs_top_srcdir/testsuite/mh/mbox1,[Mail/inbox])
-mhpath 4-10 | remove_curdir
+mhpath 4-10 | cwdrepl
],
[0],
-[Mail/inbox/4
-Mail/inbox/5
+[./Mail/inbox/4
+./Mail/inbox/5
])
MH_CHECK([mhpath msgs (all nonexistent)],[mhpath04 mhparam_msgs_all_nonex],[
MUT_MBCOPY($abs_top_srcdir/testsuite/mh/mbox1,[Mail/inbox])
-mhpath 8-10 | remove_curdir
+mhpath 8-10 | cwdrepl
],
[0],
[],
@@ -87,7 +87,7 @@ mhpath 8-10 | remove_curdir
MH_CHECK([mhpath nonexistent],[mhpath05 mhparam_nonexistent],[
MUT_MBCOPY($abs_top_srcdir/testsuite/mh/mbox1,[Mail/inbox])
-mhpath 10 | remove_curdir
+mhpath 10 | cwdrepl
],
[0],
[],
@@ -96,10 +96,10 @@ mhpath 10 | remove_curdir
MH_CHECK([mhpath new],[mhpath06 mhparam_new],[
MUT_MBCOPY($abs_top_srcdir/testsuite/mh/mbox1,[Mail/inbox])
-mhpath new | remove_curdir
+mhpath new | cwdrepl
],
[0],
-[Mail/inbox/6
+[./Mail/inbox/6
])
m4_popdef[MH_KEYWORDS])
diff --git a/mh/tests/repl.at b/mh/tests/repl.at
index 3520c63..bd58e9f 100644
--- a/mh/tests/repl.at
+++ b/mh/tests/repl.at
@@ -28,19 +28,19 @@ Subject: test input
message body
])
-echo "quit" | replcmd +inbox 1 | remove_curdir
+echo "quit" | replcmd +inbox 1 | cwdrepl
echo == Mail/draft ==
cat Mail/draft
],
[0],
-[-- Editor invocation: Mail/draft
+[-- Editor invocation: ./Mail/draft
-- Input file:
To: <gray@example.com>
Subject: Re: test input
X-Mailer: MH (AT_PACKAGE_NAME AT_PACKAGE_VERSION)
--------
-- Input file end
-What now? draft left on "Mail/draft".
+What now? draft left on "./Mail/draft".
== Mail/draft ==
To: <gray@example.com>
Subject: Re: test input
@@ -58,19 +58,19 @@ Subject: test input
message body
])
-echo "quit" | replcmd -draftfolder drafts +inbox 1 | remove_curdir
+echo "quit" | replcmd -draftfolder drafts +inbox 1 | cwdrepl
echo == Mail/drafts/1 ==
cat Mail/drafts/1
],
[0],
-[-- Editor invocation: Mail/drafts/1
+[-- Editor invocation: ./Mail/drafts/1
-- Input file:
To: <gray@example.com>
Subject: Re: test input
X-Mailer: MH (AT_PACKAGE_NAME AT_PACKAGE_VERSION)
--------
-- Input file end
-What now? draft left on "Mail/drafts/1".
+What now? draft left on "./Mail/drafts/1".
== Mail/drafts/1 ==
To: <gray@example.com>
Subject: Re: test input
diff --git a/testsuite/.gitignore b/testsuite/.gitignore
index 60475e8..d58c1e2 100644
--- a/testsuite/.gitignore
+++ b/testsuite/.gitignore
@@ -1,6 +1,7 @@
atconfig
atlocal
bs
+cwdrepl
fldel
lstuid
package.m4
diff --git a/testsuite/Makefile.am b/testsuite/Makefile.am
index 403cde2..e0eeba0 100644
--- a/testsuite/Makefile.am
+++ b/testsuite/Makefile.am
@@ -51,6 +51,7 @@ $(srcdir)/package.m4: $(top_srcdir)/configure.ac
AM_CPPFLAGS = @MU_LIB_COMMON_INCLUDES@
noinst_PROGRAMS = \
bs\
+ cwdrepl\
fldel\
lstuid\
mbdel\
@@ -76,11 +77,14 @@ smtpsend_LDADD = \
@MU_AUTHLIBS@\
${MU_LIB_MAILUTILS}
+cwdrepl_LDADD = ${MU_LIB_MAILUTILS}
+
## ------------ ##
## Test suite. ##
## ------------ ##
TESTSUITE_AT = \
+ cwdrepl.at\
fldel.at\
lstuid00.at\
lstuid01.at\
diff --git a/testsuite/cwdrepl.at b/testsuite/cwdrepl.at
new file mode 100644
index 0000000..9cd15a9
--- a/dev/null
+++ b/testsuite/cwdrepl.at
@@ -0,0 +1,59 @@
+# This file is part of GNU Mailutils. -*- Autotest -*-
+# Copyright (C) 2017 Free Software Foundation, Inc.
+#
+# GNU Mailutils is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 3, or (at
+# your option) any later version.
+#
+# GNU Mailutils is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with GNU Mailutils. If not, see <http://www.gnu.org/licenses/>.
+
+AT_SETUP([cwdrepl tool])
+AT_KEYWORDS([cwdrepl])
+
+AT_CHECK([
+pwd -P >/dev/null 2>&1 || AT_SKIP_TEST
+cwd=`pwd -P`
+cwdrepl <<EOT
+$cwd
+CWD is "$cwd"
+$cwd/foo "$cwd" end
+EOT
+],
+[0],
+[.
+CWD is "."
+./foo "." end
+])
+
+AT_CHECK([
+pwd -P >/dev/null 2>&1 || AT_SKIP_TEST
+pwd -L >/dev/null 2>&1 || AT_SKIP_TEST
+mkdir physical logical
+ln -s physical logical || AT_SKIP_TEST
+cd logical
+phy=`pwd -P`
+log=`pwd -L`
+cwdrepl <<EOT
+$phy $log
+LOG is "$log", PHY is "$phy"
+$log/foo "$log" end
+$phy/foo "$phy" end
+EOT
+],
+[0],
+[. .
+LOG is ".", PHY is "."
+./foo "." end
+./foo "." end
+])
+
+AT_CLEANUP
+
+
diff --git a/testsuite/cwdrepl.c b/testsuite/cwdrepl.c
new file mode 100644
index 0000000..9f6525f
--- a/dev/null
+++ b/testsuite/cwdrepl.c
@@ -0,0 +1,176 @@
+/* This file is part of GNU Mailutils testsuite.
+ Copyright (C) 2017 Free Software Foundation, Inc.
+
+ GNU Mailutils is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 3, or (at your option)
+ any later version.
+
+ GNU Mailutils is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with GNU Mailutils. If not, see <http://www.gnu.org/licenses/>. */
+
+/*
+
+NAME
+
+ cwdrepl - replace occurrences of CWD with .
+
+SYNOPSIS
+
+ COMMAND | cwdrepl [DIR REPL]...
+
+DESCRIPTION
+
+ Some testcases operate programs that produce full file names as part
+ of their output. To make this output independent of the actual file
+ location, this tool replaces every occurrence of the current working
+ directory with dot. Both logical (as given by the PWD environment
+ variable) and physical (as returned by getcwd(3)) locations are replaced.
+
+ The same effect could have been achieved by using "pwd -P", "pwd -L"
+ and sed, but this would pose portability problems.
+
+ Additionally, any number of DIR REPL pairs can be supplied in the command
+ line. Each pair instructs the tool to replace every occurrence of DIR
+ with REPL on output. Note that these pairs take precedence over the
+ default ones, so running "cwdrepl $PWD 'PWD'" will replace occurrences
+ of the logical current working directory name with the string PWS, instead
+ of the default dot.
+
+*/
+
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+#include <stdlib.h>
+#include <string.h>
+#include <mailutils/mailutils.h>
+
+struct dirtrans
+{
+ char *dir;
+ size_t dirlen;
+ char const *trans;
+ ssize_t translen;
+};
+
+mu_list_t translist;
+
+static int
+transcmp (const void *a, const void *b)
+{
+ struct dirtrans const *trans1 = a;
+ struct dirtrans const *trans2 = b;
+ return strcmp (trans1->dir, trans2->dir);
+}
+
+static void
+newdir (char const *dir, char const *trans)
+{
+ if (dir)
+ {
+ size_t dirlen = strlen (dir);
+ size_t translen = strlen (trans);
+ struct dirtrans *dt = mu_alloc (sizeof *dt);
+
+ while (dirlen > 0 && dir[dirlen-1] == '/')
+ dirlen--;
+
+ dt->dir = mu_alloc (dirlen + 1);
+ memcpy (dt->dir, dir, dirlen);
+ dt->dir[dirlen] = 0;
+ dt->dirlen = dirlen;
+ dt->trans = trans;
+ dt->translen = translen;
+
+ if (!translist)
+ {
+ MU_ASSERT (mu_list_create (&translist));
+ mu_list_set_comparator (translist, transcmp);
+ }
+ else if (mu_list_locate (translist, dt, NULL) == 0)
+ {
+ free (dt->dir);
+ free (dt);
+ return;
+ }
+
+ MU_ASSERT (mu_list_append (translist, dt));
+ }
+}
+
+static inline int
+isbnd (int c)
+{
+ return mu_c_is_class (c, MU_CTYPE_CNTRL|MU_CTYPE_PUNCT|MU_CTYPE_SPACE);
+}
+
+int
+main (int argc, char **argv)
+{
+ int i;
+ int rc;
+ char *buf = NULL;
+ size_t size, n;
+ mu_iterator_t itr;
+
+ mu_set_program_name (argv[0]);
+ mu_stdstream_setup (MU_STDSTREAM_RESET_NONE);
+
+ for (i = 1; i < argc; i += 2)
+ newdir (argv[i], (i + 1 < argc) ? argv[i + 1] : "");
+
+ newdir (getenv ("PWD"), ".");
+ newdir (mu_getcwd (), ".");
+
+ MU_ASSERT (mu_list_get_iterator (translist, &itr));
+ while ((rc = mu_stream_getline (mu_strin, &buf, &size, &n)) == 0 && n > 0)
+ {
+ n = mu_rtrim_class (buf, MU_CTYPE_SPACE);
+ for (mu_iterator_first (itr); !mu_iterator_is_done (itr);
+ mu_iterator_next (itr))
+ {
+ struct dirtrans *dt;
+ size_t start = 0;
+ char *p;
+
+ mu_iterator_current (itr, (void**) &dt);
+ while ((p = strstr (buf + start, dt->dir)))
+ {
+ if (isbnd (p[dt->dirlen]))
+ {
+ size_t off = p - buf;
+ size_t rest = n - start;
+ ssize_t d = (ssize_t)dt->translen - dt->dirlen;
+
+ if (d > 0)
+ {
+ if (n + d + 1 > size)
+ {
+ size = n + d + 1;
+ buf = mu_realloc (buf, size);
+ p = buf + off;
+ }
+ }
+
+ memmove (p + dt->translen, p + dt->dirlen,
+ rest - dt->dirlen + 1);
+ memcpy (p, dt->trans, dt->translen);
+
+ n += d;
+ start = off + dt->translen;
+ }
+ else
+ start++;
+ }
+ }
+ mu_stream_write (mu_strout, buf, n, NULL);
+ mu_stream_write (mu_strout, "\n", 1, NULL);
+ }
+ return 0;
+}
diff --git a/testsuite/testsuite.at b/testsuite/testsuite.at
index 880f778..addfed0 100644
--- a/testsuite/testsuite.at
+++ b/testsuite/testsuite.at
@@ -38,3 +38,4 @@ m4_include([smtp-str.at])
AT_BANNER(Various)
m4_include([ufms.at])
+m4_include([cwdrepl.at])

Return to:

Send suggestions and report system problems to the System administrator.