From 78df8f9042140b2c0ecf9d81822d1545841df746 Mon Sep 17 00:00:00 2001 From: Sergey Poznyakoff Date: Tue, 12 Mar 2013 17:39:51 +0200 Subject: Namespace normalization (3) Use WY_ prefix for configuration macros & variables. --- tests/atlocal.in | 38 +++++++++++++++++++------------------- tests/check-notify.at | 6 +++--- tests/etc/mailstats.rcin | 4 ++-- tests/etc/notify.rcin | 4 ++-- tests/etc/wydawca.rcin | 12 ++++++------ tests/mailstats.at | 2 +- tests/notify-upl.at | 2 +- tests/testsuite.at | 2 +- tests/upl11.at | 6 +++--- tests/upl12f.at | 6 +++--- tests/upl12t.at | 6 +++--- tests/upload-dry.at | 12 ++++++------ 12 files changed, 50 insertions(+), 50 deletions(-) (limited to 'tests') diff --git a/tests/atlocal.in b/tests/atlocal.in index 2f01c30..77cf11b 100644 --- a/tests/atlocal.in +++ b/tests/atlocal.in @@ -8,15 +8,15 @@ 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 rm -rf "$dir"/* @@ -27,32 +27,32 @@ 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 } @@ -61,7 +61,7 @@ wydawca_cmp() { shift 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 } @@ -70,6 +70,6 @@ wydawca_cmparc() { shift 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 @@ -54,8 +54,8 @@ Your upload of file has been rejected by the distribution 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 WYDAWCA_DIST_FILE=file @@ -81,7 +81,7 @@ wydawca_expandmeta outtmpl expout wydawca_expandmeta template experr wydawca --no-preproc -c wydawca.rc || exit $? -cat $WD_DST/mail.out +cat $WY_DST/mail.out ], [0], [expout], 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 @@ -14,13 +14,13 @@ # You should have received a copy of the GNU General Public License # along with Wydawca. If not, see . -module-prepend-load-path "@WD_MODDIR@"; +module-prepend-load-path "@WY_MODDIR@"; module mailutils mod_mailutils.la; module-init mailutils { admin-address "root@localhost"; 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 { statistics all; 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 @@ -14,13 +14,13 @@ # You should have received a copy of the GNU General Public License # along with Wydawca. If not, see . -module-prepend-load-path "@WD_MODDIR@"; +module-prepend-load-path "@WY_MODDIR@"; module mailutils mod_mailutils.la; module-init mailutils { admin-address "root@localhost"; 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}"; } # Notify the user about successful uploads 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 @@ -65,8 +65,8 @@ 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"; }; @@ -74,8 +74,8 @@ 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 <&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 AT_TESTED([wydawca]) diff --git a/tests/upl11.at b/tests/upl11.at index b5200b0..9e92f5e 100644 --- a/tests/upl11.at +++ b/tests/upl11.at @@ -41,10 +41,10 @@ wydawca: [[NOTICE]] AT_PACKAGE_TARNAME (AT_PACKAGE_NAME AT_PACKAGE_VERSION) fini 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 @@ -45,10 +45,10 @@ wydawca: [[NOTICE]] AT_PACKAGE_TARNAME (AT_PACKAGE_NAME AT_PACKAGE_VERSION) fini 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 @@ -41,10 +41,10 @@ wydawca: [[NOTICE]] AT_PACKAGE_TARNAME (AT_PACKAGE_NAME AT_PACKAGE_VERSION) fini 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 @@ -18,10 +18,10 @@ 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) wydawca: [[DEBUG]] file: directive file signature OK @@ -29,8 +29,8 @@ wydawca: [[NOTICE]] file.directive.asc: VERSION: 1.1 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 wydawca: [[INFO]] bad signatures: 0 -- cgit v1.2.1