summaryrefslogtreecommitdiffabout
path: root/tests
authorSergey Poznyakoff <gray@gnu.org.ua>2013-03-12 15:39:51 (GMT)
committer Sergey Poznyakoff <gray@gnu.org.ua>2013-03-12 15:39:51 (GMT)
commit78df8f9042140b2c0ecf9d81822d1545841df746 (patch) (unidiff)
tree6d6583ddf43cb71151f1c9cfcec8dfb2e1d9a7e3 /tests
parentcfa111e835e6467b2ee005f351daaacff2d6bb4c (diff)
downloadwydawca-78df8f9042140b2c0ecf9d81822d1545841df746.tar.gz
wydawca-78df8f9042140b2c0ecf9d81822d1545841df746.tar.bz2
Namespace normalization (3)
Use WY_ prefix for configuration macros & variables.
Diffstat (limited to 'tests') (more/less context) (ignore whitespace changes)
-rw-r--r--tests/atlocal.in38
-rw-r--r--tests/check-notify.at6
-rw-r--r--tests/etc/mailstats.rcin4
-rw-r--r--tests/etc/notify.rcin4
-rw-r--r--tests/etc/wydawca.rcin12
-rw-r--r--tests/mailstats.at2
-rw-r--r--tests/notify-upl.at2
-rw-r--r--tests/testsuite.at2
-rw-r--r--tests/upl11.at6
-rw-r--r--tests/upl12f.at6
-rw-r--r--tests/upl12t.at6
-rw-r--r--tests/upload-dry.at12
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
@@ -8,15 +8,15 @@ XFAILFILE=$abs_builddir/.badversion
8 8
9trap "cleanup; test -r $XFAILFILE && cat $XFAILFILE; exit $?" 1 2 13 15 9trap "cleanup; test -r $XFAILFILE && cat $XFAILFILE; exit $?" 1 2 13 15
10 10
11WD_CONFSRC=@abs_top_srcdir@/tests/etc 11WY_CONFSRC=@abs_top_srcdir@/tests/etc
12WD_DISTDIR=@abs_top_srcdir@/tests/dist 12WY_DISTDIR=@abs_top_srcdir@/tests/dist
13WD_SRC=@abs_top_builddir@/tests/source 13WY_SRC=@abs_top_builddir@/tests/source
14WD_DST=@abs_top_builddir@/tests/dest 14WY_DST=@abs_top_builddir@/tests/dest
15WD_MAILUTILS=@WD_MAILUTILS@ 15WY_MAILUTILS=@WY_MAILUTILS@
16MKDIR_P="@MKDIR_P@" 16MKDIR_P="@MKDIR_P@"
17 17
18wydawca_init_testdirs() { 18wydawca_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
21 if test -d "$dir"; then 21 if test -d "$dir"; then
22 rm -rf "$dir"/* 22 rm -rf "$dir"/*
@@ -27,32 +27,32 @@ wydawca_init_testdirs() {
27} 27}
28 28
29wydawca_clean_testdirs() { 29wydawca_clean_testdirs() {
30 rm -rf "$WD_SRC" "$WD_DST" 30 rm -rf "$WY_SRC" "$WY_DST"
31} 31}
32 32
33wydawca_expandmeta() { 33wydawca_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}
40 40
41wydawca_config() { 41wydawca_config() {
42 wydawca_expandmeta $WD_CONFSRC/${1}in $1 42 wydawca_expandmeta $WY_CONFSRC/${1}in $1
43} 43}
44 44
45wydawca_upload() { 45wydawca_upload() {
46 dir="$WD_SRC/$1" 46 dir="$WY_SRC/$1"
47 shift 47 shift
48 file=$1 48 file=$1
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
57} 57}
58 58
@@ -61,7 +61,7 @@ wydawca_cmp() {
61 shift 61 shift
62 for file in $@ 62 for file in $@
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
66} 66}
67 67
@@ -70,6 +70,6 @@ wydawca_cmparc() {
70 shift 70 shift
71 for file in $@ 71 for file in $@
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
75} 75}
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
54verification procedure with the following diagnostics: 54verification procedure with the following diagnostics:
55 55
56WYDAWCA_SPOOL=ckfail 56WYDAWCA_SPOOL=ckfail
57WYDAWCA_SOURCE=@WD_SRC@/fail 57WYDAWCA_SOURCE=@WY_SRC@/fail
58WYDAWCA_DEST=@WD_DST@ 58WYDAWCA_DEST=@WY_DST@
59WYDAWCA_URL=ftp://wydawca.ckfail 59WYDAWCA_URL=ftp://wydawca.ckfail
60WYDAWCA_TRIPLET_BASE=file 60WYDAWCA_TRIPLET_BASE=file
61WYDAWCA_DIST_FILE=file 61WYDAWCA_DIST_FILE=file
@@ -81,7 +81,7 @@ wydawca_expandmeta outtmpl expout
81wydawca_expandmeta template experr 81wydawca_expandmeta template experr
82 82
83wydawca --no-preproc -c wydawca.rc || exit $? 83wydawca --no-preproc -c wydawca.rc || exit $?
84cat $WD_DST/mail.out 84cat $WY_DST/mail.out
85], 85],
86[0], 86[0],
87[expout], 87[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 @@
14# You should have received a copy of the GNU General Public License 14# You should have received a copy of the GNU General Public License
15# along with Wydawca. If not, see <http://www.gnu.org/licenses/>. 15# along with Wydawca. If not, see <http://www.gnu.org/licenses/>.
16 16
17module-prepend-load-path "@WD_MODDIR@"; 17module-prepend-load-path "@WY_MODDIR@";
18module mailutils mod_mailutils.la; 18module mailutils mod_mailutils.la;
19module-init mailutils { 19module-init mailutils {
20 admin-address "root@localhost"; 20 admin-address "root@localhost";
21 from-address "wydawca-noreply@localhost"; 21 from-address "wydawca-noreply@localhost";
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
25 mail-statistics { 25 mail-statistics {
26 statistics all; 26 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 @@
14# You should have received a copy of the GNU General Public License 14# You should have received a copy of the GNU General Public License
15# along with Wydawca. If not, see <http://www.gnu.org/licenses/>. 15# along with Wydawca. If not, see <http://www.gnu.org/licenses/>.
16 16
17module-prepend-load-path "@WD_MODDIR@"; 17module-prepend-load-path "@WY_MODDIR@";
18module mailutils mod_mailutils.la; 18module mailutils mod_mailutils.la;
19module-init mailutils { 19module-init mailutils {
20 admin-address "root@localhost"; 20 admin-address "root@localhost";
21 from-address "wydawca-noreply@localhost"; 21 from-address "wydawca-noreply@localhost";
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}
25 25
26# Notify the user about successful uploads 26# 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 {
65 65
66spool test { 66spool 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 {
71 name "archive"; 71 name "archive";
72 }; 72 };
@@ -74,8 +74,8 @@ spool test {
74 74
75spool ckfail { 75spool 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;
80 check-script <<EOT 80 check-script <<EOT
81echo WYDAWCA_SPOOL=$WYDAWCA_SPOOL 81echo WYDAWCA_SPOOL=$WYDAWCA_SPOOL
@@ -90,8 +90,8 @@ EOT;
90 90
91spool ckok { 91spool 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;
96 check-script "exit 0"; 96 check-script "exit 0";
97} 97}
diff --git a/tests/mailstats.at b/tests/mailstats.at
index a7a9bae..06338a7 100644
--- a/tests/mailstats.at
+++ b/tests/mailstats.at
@@ -78,7 +78,7 @@ wydawca_expandmeta errtmpl experr
78ulimit -c unlimited 78ulimit -c unlimited
79wydawca --no-preproc -c wydawca.rc || exit $? 79wydawca --no-preproc -c wydawca.rc || exit $?
80wydawca_cmp proj file file.sig 80wydawca_cmp proj file file.sig
81cat $WD_DST/mail.out 81cat $WY_DST/mail.out
82], 82],
83[0], 83[0],
84[expout], 84[expout],
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
@@ -93,7 +93,7 @@ wydawca_expandmeta ls.sin ls.sed
93 93
94wydawca --no-preproc -c wydawca.rc || exit $? 94wydawca --no-preproc -c wydawca.rc || exit $?
95wydawca_cmp proj file file.sig 95wydawca_cmp proj file file.sig
96cat $WD_DST/mail.out | sed -f ls.sed 96cat $WY_DST/mail.out | sed -f ls.sed
97], 97],
98[0], 98[0],
99[expout], 99[expout],
diff --git a/tests/testsuite.at b/tests/testsuite.at
index 16e5a41..2cba160 100644
--- a/tests/testsuite.at
+++ b/tests/testsuite.at
@@ -23,7 +23,7 @@ m4_define([AT_SORT_PREREQ],[
23test -z "`sort < /dev/null 2>&1`" || AT_SKIP_TEST 23test -z "`sort < /dev/null 2>&1`" || AT_SKIP_TEST
24]) 24])
25 25
26m4_define([AT_MAILUTILS_PREREQ],[test "$WD_MAILUTILS" = yes || AT_SKIP_TEST]) 26m4_define([AT_MAILUTILS_PREREQ],[test "$WY_MAILUTILS" = yes || AT_SKIP_TEST])
27 27
28AT_INIT 28AT_INIT
29AT_TESTED([wydawca]) 29AT_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
41AT_CHECK([ 41AT_CHECK([
42wydawca_init_testdirs 42wydawca_init_testdirs
43wydawca_config wydawca.rc 43wydawca_config wydawca.rc
44destdir=$WD_DST/proj 44destdir=$WY_DST/proj
45test -d $destdir || $MKDIR_P -p $destdir 45test -d $destdir || $MKDIR_P -p $destdir
46cp "$WD_DISTDIR/file" "$destdir" 46cp "$WY_DISTDIR/file" "$destdir"
47cp "$WD_DISTDIR/file.sig" "$destdir" 47cp "$WY_DISTDIR/file.sig" "$destdir"
48 48
49wydawca_upload test file 49wydawca_upload test file
50 50
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
45AT_CHECK([ 45AT_CHECK([
46wydawca_init_testdirs 46wydawca_init_testdirs
47wydawca_config wydawca.rc 47wydawca_config wydawca.rc
48destdir=$WD_DST/proj 48destdir=$WY_DST/proj
49test -d $destdir || $MKDIR_P $destdir 49test -d $destdir || $MKDIR_P $destdir
50cp "$WD_DISTDIR/file" "$destdir" 50cp "$WY_DISTDIR/file" "$destdir"
51cp "$WD_DISTDIR/file.sig" "$destdir" 51cp "$WY_DISTDIR/file.sig" "$destdir"
52 52
53wydawca_upload test file file12f.directive.asc 53wydawca_upload test file file12f.directive.asc
54 54
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
41AT_CHECK([ 41AT_CHECK([
42wydawca_init_testdirs 42wydawca_init_testdirs
43wydawca_config wydawca.rc 43wydawca_config wydawca.rc
44destdir=$WD_DST/proj 44destdir=$WY_DST/proj
45test -d $destdir || $MKDIR_P $destdir 45test -d $destdir || $MKDIR_P $destdir
46cp "$WD_DISTDIR/file" "$destdir" 46cp "$WY_DISTDIR/file" "$destdir"
47cp "$WD_DISTDIR/file.sig" "$destdir" 47cp "$WY_DISTDIR/file.sig" "$destdir"
48 48
49wydawca_upload test file file12t.directive.asc 49wydawca_upload test file file12t.directive.asc
50 50
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])
18 18
19AT_DATA([template], 19AT_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
21wydawca: [[DEBUG]] @WD_SRC@/ok -> @WD_DST@ 21wydawca: [[DEBUG]] @WY_SRC@/ok -> @WY_DST@
22wydawca: [[DEBUG]] @WD_SRC@/fail -> @WD_DST@ 22wydawca: [[DEBUG]] @WY_SRC@/fail -> @WY_DST@
23wydawca: [[DEBUG]] @WD_SRC@/test -> @WD_DST@ 23wydawca: [[DEBUG]] @WY_SRC@/test -> @WY_DST@
24wydawca: [[DEBUG]] processing spool test (@WD_DST@) 24wydawca: [[DEBUG]] processing spool test (@WY_DST@)
25wydawca: [[DEBUG]] FILE file, DIST=file, SIG=file.sig, DIRECTIVE=file.directive.asc 25wydawca: [[DEBUG]] FILE file, DIST=file, SIG=file.sig, DIRECTIVE=file.directive.asc
26wydawca: [[DEBUG]] Good signature from Wydawca (Testsuite) <bug-wydawca@gnu.org.ua> 26wydawca: [[DEBUG]] Good signature from Wydawca (Testsuite) <bug-wydawca@gnu.org.ua>
27wydawca: [[DEBUG]] file: directive file signature OK 27wydawca: [[DEBUG]] file: directive file signature OK
@@ -29,8 +29,8 @@ wydawca: [[NOTICE]] file.directive.asc: VERSION: 1.1
29wydawca: [[DEBUG]] processing triplet `file' 29wydawca: [[DEBUG]] processing triplet `file'
30wydawca: [[NOTICE]] file.directive.asc: COMMENT: Gnupload for Wydawca testsuite 30wydawca: [[NOTICE]] file.directive.asc: COMMENT: Gnupload for Wydawca testsuite
31wydawca: [[DEBUG]] good detached signature for file 31wydawca: [[DEBUG]] good detached signature for file
32wydawca: [[DEBUG]] installing file to @WD_DST@/proj 32wydawca: [[DEBUG]] installing file to @WY_DST@/proj
33wydawca: [[DEBUG]] installing file.sig to @WD_DST@/proj 33wydawca: [[DEBUG]] installing file.sig to @WY_DST@/proj
34wydawca: [[INFO]] errors: 0 34wydawca: [[INFO]] errors: 0
35wydawca: [[INFO]] warnings: 0 35wydawca: [[INFO]] warnings: 0
36wydawca: [[INFO]] bad signatures: 0 36wydawca: [[INFO]] bad signatures: 0

Return to:

Send suggestions and report system problems to the System administrator.