diff options
author | Sergey Poznyakoff <gray@gnu.org.ua> | 2013-03-12 17:39:51 +0200 |
---|---|---|
committer | Sergey Poznyakoff <gray@gnu.org.ua> | 2013-03-12 17:39:51 +0200 |
commit | 78df8f9042140b2c0ecf9d81822d1545841df746 (patch) | |
tree | 6d6583ddf43cb71151f1c9cfcec8dfb2e1d9a7e3 /tests | |
parent | cfa111e835e6467b2ee005f351daaacff2d6bb4c (diff) | |
download | wydawca-78df8f9042140b2c0ecf9d81822d1545841df746.tar.gz wydawca-78df8f9042140b2c0ecf9d81822d1545841df746.tar.bz2 |
Namespace normalization (3)
Use WY_ prefix for configuration macros & variables.
Diffstat (limited to 'tests')
-rw-r--r-- | tests/atlocal.in | 38 | ||||
-rw-r--r-- | tests/check-notify.at | 6 | ||||
-rw-r--r-- | tests/etc/mailstats.rcin | 4 | ||||
-rw-r--r-- | tests/etc/notify.rcin | 4 | ||||
-rw-r--r-- | tests/etc/wydawca.rcin | 12 | ||||
-rw-r--r-- | tests/mailstats.at | 2 | ||||
-rw-r--r-- | tests/notify-upl.at | 2 | ||||
-rw-r--r-- | tests/testsuite.at | 2 | ||||
-rw-r--r-- | tests/upl11.at | 6 | ||||
-rw-r--r-- | tests/upl12f.at | 6 | ||||
-rw-r--r-- | tests/upl12t.at | 6 | ||||
-rw-r--r-- | tests/upload-dry.at | 12 |
12 files changed, 50 insertions, 50 deletions
diff --git a/tests/atlocal.in b/tests/atlocal.in index 2f01c30..77cf11b 100644 --- a/tests/atlocal.in +++ b/tests/atlocal.in @@ -9,13 +9,13 @@ XFAILFILE=$abs_builddir/.badversion trap "cleanup; test -r $XFAILFILE && cat $XFAILFILE; exit $?" 1 2 13 15 -WD_CONFSRC=@abs_top_srcdir@/tests/etc -WD_DISTDIR=@abs_top_srcdir@/tests/dist -WD_SRC=@abs_top_builddir@/tests/source -WD_DST=@abs_top_builddir@/tests/dest -WD_MAILUTILS=@WD_MAILUTILS@ +WY_CONFSRC=@abs_top_srcdir@/tests/etc +WY_DISTDIR=@abs_top_srcdir@/tests/dist +WY_SRC=@abs_top_builddir@/tests/source +WY_DST=@abs_top_builddir@/tests/dest +WY_MAILUTILS=@WY_MAILUTILS@ MKDIR_P="@MKDIR_P@" wydawca_init_testdirs() { - for dir in "$WD_SRC" "$WD_SRC/test" "${WD_SRC}/fail" "${WD_SRC}/ok" "$WD_DST" + for dir in "$WY_SRC" "$WY_SRC/test" "${WY_SRC}/fail" "${WY_SRC}/ok" "$WY_DST" do if test -d "$dir"; then @@ -28,30 +28,30 @@ wydawca_init_testdirs() { wydawca_clean_testdirs() { - rm -rf "$WD_SRC" "$WD_DST" + rm -rf "$WY_SRC" "$WY_DST" } wydawca_expandmeta() { sed "s/@USER@/$USER/g; - s,@WD_SRC@,$WD_SRC,g; - s,@WD_DST@,$WD_DST,g; - s,@WD_CONFSRC@,$WD_CONFSRC,g; - s,@WD_MODDIR@,@abs_top_builddir@/modules/mailutils,g" $1 > $2 + s,@WY_SRC@,$WY_SRC,g; + s,@WY_DST@,$WY_DST,g; + s,@WY_CONFSRC@,$WY_CONFSRC,g; + s,@WY_MODDIR@,@abs_top_builddir@/modules/mailutils,g" $1 > $2 } wydawca_config() { - wydawca_expandmeta $WD_CONFSRC/${1}in $1 + wydawca_expandmeta $WY_CONFSRC/${1}in $1 } wydawca_upload() { - dir="$WD_SRC/$1" + dir="$WY_SRC/$1" shift file=$1 shift - cp "$WD_DISTDIR/$file" "$dir" - cp "$WD_DISTDIR/$file.sig" "$dir" + cp "$WY_DISTDIR/$file" "$dir" + cp "$WY_DISTDIR/$file.sig" "$dir" if test -n "$1"; then - cp "$WD_DISTDIR/$1" "$dir/$file.directive.asc" + cp "$WY_DISTDIR/$1" "$dir/$file.directive.asc" else - cp "$WD_DISTDIR/$file.directive.asc" "$dir" + cp "$WY_DISTDIR/$file.directive.asc" "$dir" fi } @@ -62,5 +62,5 @@ wydawca_cmp() { for file in $@ do - cmp "$WD_DISTDIR/$file" "$WD_DST/$p/$file" || exit 1 + cmp "$WY_DISTDIR/$file" "$WY_DST/$p/$file" || exit 1 done } @@ -71,5 +71,5 @@ wydawca_cmparc() { for file in $@ do - cmp "$WD_DISTDIR/$file" "$WD_DST/$p/archive/$file" || exit 1 + cmp "$WY_DISTDIR/$file" "$WY_DST/$p/archive/$file" || exit 1 done } diff --git a/tests/check-notify.at b/tests/check-notify.at index d31e1b9..a357aff 100644 --- a/tests/check-notify.at +++ b/tests/check-notify.at @@ -55,6 +55,6 @@ verification procedure with the following diagnostics: WYDAWCA_SPOOL=ckfail -WYDAWCA_SOURCE=@WD_SRC@/fail -WYDAWCA_DEST=@WD_DST@ +WYDAWCA_SOURCE=@WY_SRC@/fail +WYDAWCA_DEST=@WY_DST@ WYDAWCA_URL=ftp://wydawca.ckfail WYDAWCA_TRIPLET_BASE=file @@ -82,5 +82,5 @@ wydawca_expandmeta template experr wydawca --no-preproc -c wydawca.rc || exit $? -cat $WD_DST/mail.out +cat $WY_DST/mail.out ], [0], diff --git a/tests/etc/mailstats.rcin b/tests/etc/mailstats.rcin index b3aeab7..fc37a4e 100644 --- a/tests/etc/mailstats.rcin +++ b/tests/etc/mailstats.rcin @@ -15,5 +15,5 @@ # along with Wydawca. If not, see <http://www.gnu.org/licenses/>. -module-prepend-load-path "@WD_MODDIR@"; +module-prepend-load-path "@WY_MODDIR@"; module mailutils mod_mailutils.la; module-init mailutils { @@ -21,5 +21,5 @@ module-init mailutils { from-address "wydawca-noreply@localhost"; - mailer "| @WD_CONFSRC@/nullmail @WD_DST@/mail.out -F ${sender} ${rcpt}"; + mailer "| @WY_CONFSRC@/nullmail @WY_DST@/mail.out -F ${sender} ${rcpt}"; mail-statistics { diff --git a/tests/etc/notify.rcin b/tests/etc/notify.rcin index 55f9c72..4fba0bd 100644 --- a/tests/etc/notify.rcin +++ b/tests/etc/notify.rcin @@ -15,5 +15,5 @@ # along with Wydawca. If not, see <http://www.gnu.org/licenses/>. -module-prepend-load-path "@WD_MODDIR@"; +module-prepend-load-path "@WY_MODDIR@"; module mailutils mod_mailutils.la; module-init mailutils { @@ -21,5 +21,5 @@ module-init mailutils { from-address "wydawca-noreply@localhost"; - mailer "| @WD_CONFSRC@/nullmail @WD_DST@/mail.out -F ${sender} ${rcpt}"; + mailer "| @WY_CONFSRC@/nullmail @WY_DST@/mail.out -F ${sender} ${rcpt}"; } diff --git a/tests/etc/wydawca.rcin b/tests/etc/wydawca.rcin index d020eff..a5e2187 100644 --- a/tests/etc/wydawca.rcin +++ b/tests/etc/wydawca.rcin @@ -66,6 +66,6 @@ dictionary project-uploader { spool test { url ftp://wydawca.test; - source "@WD_SRC@/test"; - destination "@WD_DST@"; + source "@WY_SRC@/test"; + destination "@WY_DST@"; archive directory { name "archive"; @@ -75,6 +75,6 @@ spool test { spool ckfail { url ftp://wydawca.ckfail; - source "@WD_SRC@/fail"; - destination "@WD_DST@"; + source "@WY_SRC@/fail"; + destination "@WY_DST@"; archive none; check-script <<EOT @@ -91,6 +91,6 @@ EOT; spool ckok { url ftp://wydawca.ckok; - source "@WD_SRC@/ok"; - destination "@WD_DST@"; + source "@WY_SRC@/ok"; + destination "@WY_DST@"; archive none; check-script "exit 0"; diff --git a/tests/mailstats.at b/tests/mailstats.at index a7a9bae..06338a7 100644 --- a/tests/mailstats.at +++ b/tests/mailstats.at @@ -79,5 +79,5 @@ ulimit -c unlimited wydawca --no-preproc -c wydawca.rc || exit $? wydawca_cmp proj file file.sig -cat $WD_DST/mail.out +cat $WY_DST/mail.out ], [0], diff --git a/tests/notify-upl.at b/tests/notify-upl.at index 60574a9..2c60c90 100644 --- a/tests/notify-upl.at +++ b/tests/notify-upl.at @@ -94,5 +94,5 @@ wydawca_expandmeta ls.sin ls.sed wydawca --no-preproc -c wydawca.rc || exit $? wydawca_cmp proj file file.sig -cat $WD_DST/mail.out | sed -f ls.sed +cat $WY_DST/mail.out | sed -f ls.sed ], [0], diff --git a/tests/testsuite.at b/tests/testsuite.at index 16e5a41..2cba160 100644 --- a/tests/testsuite.at +++ b/tests/testsuite.at @@ -24,5 +24,5 @@ test -z "`sort < /dev/null 2>&1`" || AT_SKIP_TEST ]) -m4_define([AT_MAILUTILS_PREREQ],[test "$WD_MAILUTILS" = yes || AT_SKIP_TEST]) +m4_define([AT_MAILUTILS_PREREQ],[test "$WY_MAILUTILS" = yes || AT_SKIP_TEST]) AT_INIT diff --git a/tests/upl11.at b/tests/upl11.at index b5200b0..9e92f5e 100644 --- a/tests/upl11.at +++ b/tests/upl11.at @@ -42,8 +42,8 @@ AT_CHECK([ wydawca_init_testdirs wydawca_config wydawca.rc -destdir=$WD_DST/proj +destdir=$WY_DST/proj test -d $destdir || $MKDIR_P -p $destdir -cp "$WD_DISTDIR/file" "$destdir" -cp "$WD_DISTDIR/file.sig" "$destdir" +cp "$WY_DISTDIR/file" "$destdir" +cp "$WY_DISTDIR/file.sig" "$destdir" wydawca_upload test file diff --git a/tests/upl12f.at b/tests/upl12f.at index f3d96e5..08d798e 100644 --- a/tests/upl12f.at +++ b/tests/upl12f.at @@ -46,8 +46,8 @@ AT_CHECK([ wydawca_init_testdirs wydawca_config wydawca.rc -destdir=$WD_DST/proj +destdir=$WY_DST/proj test -d $destdir || $MKDIR_P $destdir -cp "$WD_DISTDIR/file" "$destdir" -cp "$WD_DISTDIR/file.sig" "$destdir" +cp "$WY_DISTDIR/file" "$destdir" +cp "$WY_DISTDIR/file.sig" "$destdir" wydawca_upload test file file12f.directive.asc diff --git a/tests/upl12t.at b/tests/upl12t.at index faab877..17854d9 100644 --- a/tests/upl12t.at +++ b/tests/upl12t.at @@ -42,8 +42,8 @@ AT_CHECK([ wydawca_init_testdirs wydawca_config wydawca.rc -destdir=$WD_DST/proj +destdir=$WY_DST/proj test -d $destdir || $MKDIR_P $destdir -cp "$WD_DISTDIR/file" "$destdir" -cp "$WD_DISTDIR/file.sig" "$destdir" +cp "$WY_DISTDIR/file" "$destdir" +cp "$WY_DISTDIR/file.sig" "$destdir" wydawca_upload test file file12t.directive.asc diff --git a/tests/upload-dry.at b/tests/upload-dry.at index 56ccc67..14389e1 100644 --- a/tests/upload-dry.at +++ b/tests/upload-dry.at @@ -19,8 +19,8 @@ AT_SETUP([Dry-run upload]) AT_DATA([template], [wydawca: [[NOTICE]] AT_PACKAGE_TARNAME (AT_PACKAGE_NAME AT_PACKAGE_VERSION) started -wydawca: [[DEBUG]] @WD_SRC@/ok -> @WD_DST@ -wydawca: [[DEBUG]] @WD_SRC@/fail -> @WD_DST@ -wydawca: [[DEBUG]] @WD_SRC@/test -> @WD_DST@ -wydawca: [[DEBUG]] processing spool test (@WD_DST@) +wydawca: [[DEBUG]] @WY_SRC@/ok -> @WY_DST@ +wydawca: [[DEBUG]] @WY_SRC@/fail -> @WY_DST@ +wydawca: [[DEBUG]] @WY_SRC@/test -> @WY_DST@ +wydawca: [[DEBUG]] processing spool test (@WY_DST@) wydawca: [[DEBUG]] FILE file, DIST=file, SIG=file.sig, DIRECTIVE=file.directive.asc wydawca: [[DEBUG]] Good signature from Wydawca (Testsuite) <bug-wydawca@gnu.org.ua> @@ -30,6 +30,6 @@ wydawca: [[DEBUG]] processing triplet `file' wydawca: [[NOTICE]] file.directive.asc: COMMENT: Gnupload for Wydawca testsuite wydawca: [[DEBUG]] good detached signature for file -wydawca: [[DEBUG]] installing file to @WD_DST@/proj -wydawca: [[DEBUG]] installing file.sig to @WD_DST@/proj +wydawca: [[DEBUG]] installing file to @WY_DST@/proj +wydawca: [[DEBUG]] installing file.sig to @WY_DST@/proj wydawca: [[INFO]] errors: 0 wydawca: [[INFO]] warnings: 0 |