More size reductions via shell functions.

* atspecific.at (AT_CVS_SETUP): Move some AT_CHECK calls into...
(cvs_client_server_or_skip): ...this shell function.
* basic.at (cvs_project_init_simple): Only allow expansion once.

src/tests/ChangeLog

+2003-11-25  Derek R. Price  <derek@ximbiot.com>
+
+	More size reductions via shell functions.
+
+	* atspecific.at (AT_CVS_SETUP): Move some AT_CHECK calls into...
+	(cvs_client_server_or_skip): ...this shell function.
+	* basic.at (cvs_project_init_simple): Only allow expansion once.
+
 2003-11-20  Derek R. Price  <derek@ximbiot.com>
 
 	* atspecific.at (AT_CVS_SETUP): Remove call to cvs_project_init.

src/tests/atspecific.m4

@@ -59,6 +59,18 @@ cd project ||
 
 
 
+m4_divert_text([DEFAULTS],
+[#cvs_client_server_or_skip()
+#
+# Skip this test unless the relevant executables are capable of client and
+# server modes.
+cvs_client_server_or_skip() {
+AT_CHECK([cvs --version |grep client || exit 77], 0, ignore)dnl
+AT_CHECK([$server --version |grep server || exit 77], 0, ignore)dnl
+}])
+
+
+
 # AT_CVS_SETUP(DESCRIPTION)
 # -------------------------
 # Set up a CVS test with description DESCRIPTION.
@@ -104,8 +116,7 @@ AT_CHECK([ln -s realcvsroot $at_group_dir/cvsroot || exit 77])
 CVSROOT_DIR=$at_group_dir/cvsroot
 m4_ifvaln(m4_quote(AT_CVS_clientserver),
 [AT_KEYWORDS([remote])dnl
-AT_CHECK([cvs --version |grep client || exit 77], 0, ignore)dnl
-AT_CHECK([$server --version |grep server || exit 77], 0, ignore)dnl
+cvs_client_server_or_skip
 CVS_SERVER=$server; export CVS_SERVER
 method=:fork:],
 [AT_KEYWORDS([local])dnl

src/tests/basic.at

@@ -95,17 +95,17 @@ AT_CLEANUP # Adding files
 
 
 
-# cvs_project_init_simple()
+m4_expand_once([m4_divert_text([DEFAULTS],
+[# cvs_project_init_simple()
 #
-# This project creates the following starter project.
+# This function creates the following starter project.
 #
 #   project
 #     \-sdir
 #         \-ssdir
 #             \-ssfile
 #
-m4_divert_text([DEFAULTS],
-[cvs_project_init_simple()
+cvs_project_init_simple()
 {
 cvs_project_init
 
@@ -133,7 +133,7 @@ initial revision: 1.1
 done
 ])
 cd ../..
-}])dnl
+}])])dnl