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 | |||
@@ -10,7 +10,7 @@ trap "cleanup; test -r $XFAILFILE && cat $XFAILFILE; exit $?" 1 2 13 15 | |||
10 | 10 | ||
11 | WD_CONFSRC=@abs_top_srcdir@/tests/etc | 11 | WY_CONFSRC=@abs_top_srcdir@/tests/etc |
12 | WD_DISTDIR=@abs_top_srcdir@/tests/dist | 12 | WY_DISTDIR=@abs_top_srcdir@/tests/dist |
13 | WD_SRC=@abs_top_builddir@/tests/source | 13 | WY_SRC=@abs_top_builddir@/tests/source |
14 | WD_DST=@abs_top_builddir@/tests/dest | 14 | WY_DST=@abs_top_builddir@/tests/dest |
15 | WD_MAILUTILS=@WD_MAILUTILS@ | 15 | WY_MAILUTILS=@WY_MAILUTILS@ |
16 | MKDIR_P="@MKDIR_P@" | 16 | MKDIR_P="@MKDIR_P@" |
@@ -18,3 +18,3 @@ MKDIR_P="@MKDIR_P@" | |||
18 | wydawca_init_testdirs() { | 18 | wydawca_init_testdirs() { |
19 | for dir in "$WD_SRC" "$WD_SRC/test" "${WD_SRC}/fail" "${WD_SRC}/ok" "$WD_DST" | 19 | for dir in "$WY_SRC" "$WY_SRC/test" "${WY_SRC}/fail" "${WY_SRC}/ok" "$WY_DST" |
20 | do | 20 | do |
@@ -29,3 +29,3 @@ wydawca_init_testdirs() { | |||
29 | wydawca_clean_testdirs() { | 29 | wydawca_clean_testdirs() { |
30 | rm -rf "$WD_SRC" "$WD_DST" | 30 | rm -rf "$WY_SRC" "$WY_DST" |
31 | } | 31 | } |
@@ -34,6 +34,6 @@ wydawca_expandmeta() { | |||
34 | sed "s/@USER@/$USER/g; | 34 | sed "s/@USER@/$USER/g; |
35 | s,@WD_SRC@,$WD_SRC,g; | 35 | s,@WY_SRC@,$WY_SRC,g; |
36 | s,@WD_DST@,$WD_DST,g; | 36 | s,@WY_DST@,$WY_DST,g; |
37 | s,@WD_CONFSRC@,$WD_CONFSRC,g; | 37 | s,@WY_CONFSRC@,$WY_CONFSRC,g; |
38 | s,@WD_MODDIR@,@abs_top_builddir@/modules/mailutils,g" $1 > $2 | 38 | s,@WY_MODDIR@,@abs_top_builddir@/modules/mailutils,g" $1 > $2 |
39 | } | 39 | } |
@@ -41,3 +41,3 @@ wydawca_expandmeta() { | |||
41 | wydawca_config() { | 41 | wydawca_config() { |
42 | wydawca_expandmeta $WD_CONFSRC/${1}in $1 | 42 | wydawca_expandmeta $WY_CONFSRC/${1}in $1 |
43 | } | 43 | } |
@@ -45,3 +45,3 @@ wydawca_config() { | |||
45 | wydawca_upload() { | 45 | wydawca_upload() { |
46 | dir="$WD_SRC/$1" | 46 | dir="$WY_SRC/$1" |
47 | shift | 47 | shift |
@@ -49,8 +49,8 @@ wydawca_upload() { | |||
49 | shift | 49 | shift |
50 | cp "$WD_DISTDIR/$file" "$dir" | 50 | cp "$WY_DISTDIR/$file" "$dir" |
51 | cp "$WD_DISTDIR/$file.sig" "$dir" | 51 | cp "$WY_DISTDIR/$file.sig" "$dir" |
52 | if test -n "$1"; then | 52 | if test -n "$1"; then |
53 | cp "$WD_DISTDIR/$1" "$dir/$file.directive.asc" | 53 | cp "$WY_DISTDIR/$1" "$dir/$file.directive.asc" |
54 | else | 54 | else |
55 | cp "$WD_DISTDIR/$file.directive.asc" "$dir" | 55 | cp "$WY_DISTDIR/$file.directive.asc" "$dir" |
56 | fi | 56 | fi |
@@ -63,3 +63,3 @@ wydawca_cmp() { | |||
63 | do | 63 | do |
64 | cmp "$WD_DISTDIR/$file" "$WD_DST/$p/$file" || exit 1 | 64 | cmp "$WY_DISTDIR/$file" "$WY_DST/$p/$file" || exit 1 |
65 | done | 65 | done |
@@ -72,3 +72,3 @@ wydawca_cmparc() { | |||
72 | do | 72 | do |
73 | cmp "$WD_DISTDIR/$file" "$WD_DST/$p/archive/$file" || exit 1 | 73 | cmp "$WY_DISTDIR/$file" "$WY_DST/$p/archive/$file" || exit 1 |
74 | done | 74 | 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 | |||
@@ -56,4 +56,4 @@ verification procedure with the following diagnostics: | |||
56 | WYDAWCA_SPOOL=ckfail | 56 | WYDAWCA_SPOOL=ckfail |
57 | WYDAWCA_SOURCE=@WD_SRC@/fail | 57 | WYDAWCA_SOURCE=@WY_SRC@/fail |
58 | WYDAWCA_DEST=@WD_DST@ | 58 | WYDAWCA_DEST=@WY_DST@ |
59 | WYDAWCA_URL=ftp://wydawca.ckfail | 59 | WYDAWCA_URL=ftp://wydawca.ckfail |
@@ -83,3 +83,3 @@ wydawca_expandmeta template experr | |||
83 | wydawca --no-preproc -c wydawca.rc || exit $? | 83 | wydawca --no-preproc -c wydawca.rc || exit $? |
84 | cat $WD_DST/mail.out | 84 | cat $WY_DST/mail.out |
85 | ], | 85 | ], |
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 | |||
@@ -16,3 +16,3 @@ | |||
16 | 16 | ||
17 | module-prepend-load-path "@WD_MODDIR@"; | 17 | module-prepend-load-path "@WY_MODDIR@"; |
18 | module mailutils mod_mailutils.la; | 18 | module mailutils mod_mailutils.la; |
@@ -22,3 +22,3 @@ module-init mailutils { | |||
22 | 22 | ||
23 | mailer "| @WD_CONFSRC@/nullmail @WD_DST@/mail.out -F ${sender} ${rcpt}"; | 23 | mailer "| @WY_CONFSRC@/nullmail @WY_DST@/mail.out -F ${sender} ${rcpt}"; |
24 | 24 | ||
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 | |||
@@ -16,3 +16,3 @@ | |||
16 | 16 | ||
17 | module-prepend-load-path "@WD_MODDIR@"; | 17 | module-prepend-load-path "@WY_MODDIR@"; |
18 | module mailutils mod_mailutils.la; | 18 | module mailutils mod_mailutils.la; |
@@ -22,3 +22,3 @@ module-init mailutils { | |||
22 | 22 | ||
23 | mailer "| @WD_CONFSRC@/nullmail @WD_DST@/mail.out -F ${sender} ${rcpt}"; | 23 | mailer "| @WY_CONFSRC@/nullmail @WY_DST@/mail.out -F ${sender} ${rcpt}"; |
24 | } | 24 | } |
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 | |||
@@ -67,4 +67,4 @@ spool test { | |||
67 | url ftp://wydawca.test; | 67 | url ftp://wydawca.test; |
68 | source "@WD_SRC@/test"; | 68 | source "@WY_SRC@/test"; |
69 | destination "@WD_DST@"; | 69 | destination "@WY_DST@"; |
70 | archive directory { | 70 | archive directory { |
@@ -76,4 +76,4 @@ spool ckfail { | |||
76 | url ftp://wydawca.ckfail; | 76 | url ftp://wydawca.ckfail; |
77 | source "@WD_SRC@/fail"; | 77 | source "@WY_SRC@/fail"; |
78 | destination "@WD_DST@"; | 78 | destination "@WY_DST@"; |
79 | archive none; | 79 | archive none; |
@@ -92,4 +92,4 @@ spool ckok { | |||
92 | url ftp://wydawca.ckok; | 92 | url ftp://wydawca.ckok; |
93 | source "@WD_SRC@/ok"; | 93 | source "@WY_SRC@/ok"; |
94 | destination "@WD_DST@"; | 94 | destination "@WY_DST@"; |
95 | archive none; | 95 | archive none; |
diff --git a/tests/mailstats.at b/tests/mailstats.at index a7a9bae..06338a7 100644 --- a/tests/mailstats.at +++ b/tests/mailstats.at | |||
@@ -80,3 +80,3 @@ wydawca --no-preproc -c wydawca.rc || exit $? | |||
80 | wydawca_cmp proj file file.sig | 80 | wydawca_cmp proj file file.sig |
81 | cat $WD_DST/mail.out | 81 | cat $WY_DST/mail.out |
82 | ], | 82 | ], |
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 | |||
@@ -95,3 +95,3 @@ wydawca --no-preproc -c wydawca.rc || exit $? | |||
95 | wydawca_cmp proj file file.sig | 95 | wydawca_cmp proj file file.sig |
96 | cat $WD_DST/mail.out | sed -f ls.sed | 96 | cat $WY_DST/mail.out | sed -f ls.sed |
97 | ], | 97 | ], |
diff --git a/tests/testsuite.at b/tests/testsuite.at index 16e5a41..2cba160 100644 --- a/tests/testsuite.at +++ b/tests/testsuite.at | |||
@@ -25,3 +25,3 @@ test -z "`sort < /dev/null 2>&1`" || AT_SKIP_TEST | |||
25 | 25 | ||
26 | m4_define([AT_MAILUTILS_PREREQ],[test "$WD_MAILUTILS" = yes || AT_SKIP_TEST]) | 26 | m4_define([AT_MAILUTILS_PREREQ],[test "$WY_MAILUTILS" = yes || AT_SKIP_TEST]) |
27 | 27 | ||
diff --git a/tests/upl11.at b/tests/upl11.at index b5200b0..9e92f5e 100644 --- a/tests/upl11.at +++ b/tests/upl11.at | |||
@@ -43,6 +43,6 @@ wydawca_init_testdirs | |||
43 | wydawca_config wydawca.rc | 43 | wydawca_config wydawca.rc |
44 | destdir=$WD_DST/proj | 44 | destdir=$WY_DST/proj |
45 | test -d $destdir || $MKDIR_P -p $destdir | 45 | test -d $destdir || $MKDIR_P -p $destdir |
46 | cp "$WD_DISTDIR/file" "$destdir" | 46 | cp "$WY_DISTDIR/file" "$destdir" |
47 | cp "$WD_DISTDIR/file.sig" "$destdir" | 47 | cp "$WY_DISTDIR/file.sig" "$destdir" |
48 | 48 | ||
diff --git a/tests/upl12f.at b/tests/upl12f.at index f3d96e5..08d798e 100644 --- a/tests/upl12f.at +++ b/tests/upl12f.at | |||
@@ -47,6 +47,6 @@ wydawca_init_testdirs | |||
47 | wydawca_config wydawca.rc | 47 | wydawca_config wydawca.rc |
48 | destdir=$WD_DST/proj | 48 | destdir=$WY_DST/proj |
49 | test -d $destdir || $MKDIR_P $destdir | 49 | test -d $destdir || $MKDIR_P $destdir |
50 | cp "$WD_DISTDIR/file" "$destdir" | 50 | cp "$WY_DISTDIR/file" "$destdir" |
51 | cp "$WD_DISTDIR/file.sig" "$destdir" | 51 | cp "$WY_DISTDIR/file.sig" "$destdir" |
52 | 52 | ||
diff --git a/tests/upl12t.at b/tests/upl12t.at index faab877..17854d9 100644 --- a/tests/upl12t.at +++ b/tests/upl12t.at | |||
@@ -43,6 +43,6 @@ wydawca_init_testdirs | |||
43 | wydawca_config wydawca.rc | 43 | wydawca_config wydawca.rc |
44 | destdir=$WD_DST/proj | 44 | destdir=$WY_DST/proj |
45 | test -d $destdir || $MKDIR_P $destdir | 45 | test -d $destdir || $MKDIR_P $destdir |
46 | cp "$WD_DISTDIR/file" "$destdir" | 46 | cp "$WY_DISTDIR/file" "$destdir" |
47 | cp "$WD_DISTDIR/file.sig" "$destdir" | 47 | cp "$WY_DISTDIR/file.sig" "$destdir" |
48 | 48 | ||
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 | |||
@@ -20,6 +20,6 @@ AT_DATA([template], | |||
20 | [wydawca: [[NOTICE]] AT_PACKAGE_TARNAME (AT_PACKAGE_NAME AT_PACKAGE_VERSION) started | 20 | [wydawca: [[NOTICE]] AT_PACKAGE_TARNAME (AT_PACKAGE_NAME AT_PACKAGE_VERSION) started |
21 | wydawca: [[DEBUG]] @WD_SRC@/ok -> @WD_DST@ | 21 | wydawca: [[DEBUG]] @WY_SRC@/ok -> @WY_DST@ |
22 | wydawca: [[DEBUG]] @WD_SRC@/fail -> @WD_DST@ | 22 | wydawca: [[DEBUG]] @WY_SRC@/fail -> @WY_DST@ |
23 | wydawca: [[DEBUG]] @WD_SRC@/test -> @WD_DST@ | 23 | wydawca: [[DEBUG]] @WY_SRC@/test -> @WY_DST@ |
24 | wydawca: [[DEBUG]] processing spool test (@WD_DST@) | 24 | wydawca: [[DEBUG]] processing spool test (@WY_DST@) |
25 | wydawca: [[DEBUG]] FILE file, DIST=file, SIG=file.sig, DIRECTIVE=file.directive.asc | 25 | wydawca: [[DEBUG]] FILE file, DIST=file, SIG=file.sig, DIRECTIVE=file.directive.asc |
@@ -31,4 +31,4 @@ wydawca: [[NOTICE]] file.directive.asc: COMMENT: Gnupload for Wydawca testsuite | |||
31 | wydawca: [[DEBUG]] good detached signature for file | 31 | wydawca: [[DEBUG]] good detached signature for file |
32 | wydawca: [[DEBUG]] installing file to @WD_DST@/proj | 32 | wydawca: [[DEBUG]] installing file to @WY_DST@/proj |
33 | wydawca: [[DEBUG]] installing file.sig to @WD_DST@/proj | 33 | wydawca: [[DEBUG]] installing file.sig to @WY_DST@/proj |
34 | wydawca: [[INFO]] errors: 0 | 34 | wydawca: [[INFO]] errors: 0 |