>>>> "APA" == Adrian Aichner
<Adrian.Aichner(a)T-Online.De> writes:
APA> Built from latest CVS.
APA> check-temacs still reports some errors:
APA> Unexpected error (void-function defadvice)
I don't know that this patch is TheRightThang[tm], but try it anyway.
Shoot first, ask questions later, you know. Patch is mostly
whitespace reformatting---the substance is the warnings.
Untested---Debian just hosed GCC and/or glibc, can't build right now....
Self-documenting.:-)
Index: tests/automated/syntax-tests.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/tests/automated/syntax-tests.el,v
retrieving revision 1.2
diff -u -r1.2 syntax-tests.el
--- tests/automated/syntax-tests.el 12 Apr 2001 18:24:55 -0000 1.2
+++ tests/automated/syntax-tests.el 11 Aug 2002 06:25:04 -0000
@@ -127,16 +127,22 @@
;; Test forward-comment at buffer boundaries
(with-temp-buffer
- (c-mode)
- (insert "// comment\n")
- (forward-comment -2)
- (Assert (eq (point) (point-min)))
+ (if (not (fboundp 'c-mode))
+ (princ "\
+SKIPPED: comment and parse-partial-sexp tests. REASON: c-mode unavailable.
+Probably XEmacs cannot find your installed packages.
+Set EMACSPACKAGEPATH to your package hierarchy root to enable these tests.\n")
+ (c-mode)
+
+ (insert "// comment\n")
+ (forward-comment -2)
+ (Assert (eq (point) (point-min)))
- (let ((point (point)))
- (insert "/* comment */")
- (goto-char point)
- (forward-comment 2)
- (Assert (eq (point) (point-max)))
+ (let ((point (point)))
+ (insert "/* comment */")
+ (goto-char point)
+ (forward-comment 2)
+ (Assert (eq (point) (point-max)))
- ;; this last used to crash
- (parse-partial-sexp point (point-max))))
+ ;; this last used to crash
+ (parse-partial-sexp point (point-max)))))
Index: tests/automated/test-harness.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/tests/automated/test-harness.el,v
retrieving revision 1.5
diff -u -r1.5 test-harness.el
--- tests/automated/test-harness.el 20 Jul 2002 15:22:46 -0000 1.5
+++ tests/automated/test-harness.el 11 Aug 2002 06:25:04 -0000
@@ -201,31 +201,36 @@
(defmacro Check-Message (expected-message-regexp &rest body)
- (let ((quoted-body (if (= 1 (length body))
- `(quote ,(car body)) `(quote (progn ,@body)))))
- `(let ((messages ""))
- (defadvice message (around collect activate)
- (defvar messages)
- (let ((msg-string (apply 'format (ad-get-args 0))))
- (setq messages (concat messages msg-string))
- msg-string))
- (condition-case error-info
- (progn
- (setq trick-optimizer (progn ,@body))
- (if (string-match ,expected-message-regexp messages)
- (progn
- (Print-Pass "%S ==> value %S, message %S, matching %S, as expected"
- ,quoted-body trick-optimizer messages ',expected-message-regexp)
- (incf passes))
- (Print-Failure "%S ==> value %S, message %S, NOT matching expected
%S"
- ,quoted-body trick-optimizer messages
- ',expected-message-regexp)
- (incf missing-message-failures)))
- (error
- (Print-Failure "%S ==> unexpected error %S"
- ,quoted-body error-info)
- (incf other-failures)))
- (ad-unadvise 'message))))
+ (if (not (fboundp 'defadvice))
+ `(princ (format "SKIPPED: test for %S. REASON: advice unavailable.
+Probably XEmacs cannot find your installed packages.
+Set EMACSPACKAGEPATH to your package hierarchy root to enable these tests.\n"
+ expected-message-regexp))
+ (let ((quoted-body (if (= 1 (length body))
+ `(quote ,(car body)) `(quote (progn ,@body)))))
+ `(let ((messages ""))
+ (defadvice message (around collect activate)
+ (defvar messages)
+ (let ((msg-string (apply 'format (ad-get-args 0))))
+ (setq messages (concat messages msg-string))
+ msg-string))
+ (condition-case error-info
+ (progn
+ (setq trick-optimizer (progn ,@body))
+ (if (string-match ,expected-message-regexp messages)
+ (progn
+ (Print-Pass "%S ==> value %S, message %S, matching %S, as expected"
+ ,quoted-body trick-optimizer messages ',expected-message-regexp)
+ (incf passes))
+ (Print-Failure "%S ==> value %S, message %S, NOT matching expected
%S"
+ ,quoted-body trick-optimizer messages
+ ',expected-message-regexp)
+ (incf missing-message-failures)))
+ (error
+ (Print-Failure "%S ==> unexpected error %S"
+ ,quoted-body error-info)
+ (incf other-failures)))
+ (ad-unadvise 'message)))))
(defmacro Ignore-Ebola (&rest body)
`(let ((debug-issue-ebola-notices -42)) ,@body))
--
Institute of Policy and Planning Sciences
http://turnbull.sk.tsukuba.ac.jp
University of Tsukuba Tennodai 1-1-1 Tsukuba 305-8573 JAPAN
My nostalgia for Icon makes me forget about any of the bad things. I don't
have much nostalgia for Perl, so its faults I remember. Scott Gilbert c.l.py