--- a/lisp/test-harness.el	Tue Feb 22 22:56:02 2011 +0100
+++ b/lisp/test-harness.el	Thu Mar 17 23:42:59 2011 +0100
@@ -126,7 +126,7 @@
 
 (defvar test-harness-current-file nil)
 
-(defvar emacs-lisp-file-regexp (purecopy "\\.el\\'")
+(defvar emacs-lisp-file-regexp "\\.el\\'"
   "*Regexp which matches Emacs Lisp source files.")
 
 (defconst test-harness-file-summary-template
@@ -332,7 +332,7 @@
 	"Wrap a BODY that consists of tests that are known to trigger an error.
 This causes messages to be printed on failure indicating that this is expected,
 and on success indicating that this is unexpected."
-	(let ((quoted-body (if (= 1 (length body))
+	(let ((quoted-body (if (eql 1 (length body))
 			       `(quote ,(car body)) `(quote (progn ,@body)))))
           `(let ((test-harness-bug-expected t)
 		 (test-harness-failure-tag "KNOWN BUG")
@@ -399,12 +399,12 @@
 	(let ((test-assertion assertion)
 	      (negated nil))
 	  (when (and (listp test-assertion)
-		     (= 2 (length test-assertion))
+		     (eql 2 (length test-assertion))
 		     (memq (car test-assertion) '(not null)))
 	    (setq test-assertion (cadr test-assertion))
 	    (setq negated t))
 	  (when (and (listp test-assertion)
-		     (= 3 (length test-assertion))
+		     (eql 3 (length test-assertion))
 		     (member (car test-assertion)
 			     '(eq eql equal equalp = string= < <= > >=)))
 	    (let* ((test (car test-assertion))
@@ -447,7 +447,7 @@
 	    (cl-assertion-failed nil))))
 
       (defmacro Check-Error (expected-error &rest body)
-	(let ((quoted-body (if (= 1 (length body))
+	(let ((quoted-body (if (eql 1 (length body))
 			       `(quote ,(car body)) `(quote (progn ,@body)))))
 	  `(condition-case error-info
 	       (progn
@@ -467,7 +467,7 @@
 
       (defmacro Check-Error-Message (expected-error expected-error-regexp
 						    &rest body)
-	(let ((quoted-body (if (= 1 (length body))
+	(let ((quoted-body (if (eql 1 (length body))
 			       `(quote ,(car body)) `(quote (progn ,@body)))))
 	  `(condition-case error-info
 	       (progn
@@ -496,7 +496,7 @@
 
       ;; Do not use this with Silence-Message.
       (defmacro Check-Message (expected-message-regexp &rest body)
-	(let ((quoted-body (if (= 1 (length body))
+	(let ((quoted-body (if (eql 1 (length body))
 			       `(quote ,(car body))
 			     `(quote (progn ,@body)))))
 	  `(Skip-Test-Unless (fboundp 'defadvice) "can't defadvice"
@@ -754,7 +754,7 @@
 		 (if (= unexpected-test-suite-failures 1) "was" "were")
 		 unexpected-test-suite-failures
 		 (if (= unexpected-test-suite-failures 1) "failure" "failures")
-		 (if (= (length unexpected-test-suite-failure-files) 1)
+		 (if (eql (length unexpected-test-suite-failure-files) 1)
 		     "file"
 		   "files"))
 	(while unexpected-test-suite-failure-files