# HG changeset patch
# User Stephen J. Turnbull <stephen@xemacs.org>
# Date 1258470494 -32400
# Node ID b8afe0f9cbe3ecdbe0a06f6f4fe0b356ee11d033
# Parent  91f85b19749f7b4d6b9c626c053504f8f1603e67
Restore some doc changes that got dropped in a merge.
I wish I were using git\!

diff -r 91f85b19749f -r b8afe0f9cbe3 src/ChangeLog
--- a/src/ChangeLog	Tue Nov 17 23:45:42 2009 +0900
+++ b/src/ChangeLog	Wed Nov 18 00:08:14 2009 +0900
@@ -1,3 +1,28 @@
+2009-11-16  Stephen J. Turnbull  <stephen@xemacs.org>
+
+	Remove C asserts from test-format-data-conversion.
+	See also changes in test-harness.el and c-tests.el in tests/automated.
+
+	* tests.c
+	(Ftest_hash_tables):
+	(Ftest_data_format_conversion):
+	Each now collects a list of test results and returns it.
+	Update docstrings.
+	(DFC_INITIALIZE):
+	(DFC_CHECK_LENGTH):
+	(DFC_CHECK_CONTENT):
+	(DFC_RESULT_PASS):
+	New macros.
+	(DFC_CHECK_DATA_NUL):
+	(DFC_CHECK_DATA):
+	Use the new macros.
+	Add an argument for the test description.
+	(DFC_CHECK_DATA_COND_EOL_NUL)
+	(DFC_CHECK_DATA_COND_EOL)
+	(DFC_CHECK_DATA_COND_MULE_NUL): 
+	(DFC_CHECK_DATA_COND_MULE):
+	Add an argument for the test description.
+
 2009-11-17  Stephen J. Turnbull  <stephen@xemacs.org>
 
 	Fix issue630.
diff -r 91f85b19749f -r b8afe0f9cbe3 src/tests.c
--- a/src/tests.c	Tue Nov 17 23:45:42 2009 +0900
+++ b/src/tests.c	Wed Nov 18 00:08:14 2009 +0900
@@ -585,7 +585,13 @@
 
 
 DEFUN ("test-hash-tables", Ftest_hash_tables, 0, 0, "", /*
-Test C interface to hash tables.
+  Return list of results of testing C interface to hash tables.
+For use by the automated test suite.  See tests/automated/c-tests.
+
+Each element is a list (DESCRIPTION, STATUS, REASON).
+DESCRIPTION is a string describing the test.
+STATUS is a symbol, either t (pass) or nil (fail).
+REASON is nil or a string describing the failure (not required).
 */
        ())
 {
diff -r 91f85b19749f -r b8afe0f9cbe3 tests/ChangeLog
--- a/tests/ChangeLog	Tue Nov 17 23:45:42 2009 +0900
+++ b/tests/ChangeLog	Wed Nov 18 00:08:14 2009 +0900
@@ -1,3 +1,15 @@
+2009-11-16  Stephen J. Turnbull  <stephen@xemacs.org>
+
+	Remove C asserts from test-format-data-conversion.
+	See also changes in src/tests.c.
+
+	* automated/c-tests.el (main loop):
+	Process a list of results passed out of the C-level test function.
+
+	* automated/test-harness.el (Assert):
+	Allow an optional description for use in loops and other cases
+	where the assertion itself is not informative (eg, c-test.el).
+
 2009-11-16  Stephen J. Turnbull  <stephen@xemacs.org>
 
 	* reproduce-crashes.el (13): New bug reported by Adam Sjogren.