From: Lev Lamberov <dogsleg@debian.org>
Subject: Load installed elisp code if available

This patch loads installed elisp code if available, so tests won't
fail in autopkgtest environment.

--- a/test/utils.el
+++ b/test/utils.el
@@ -41,14 +41,17 @@
   "Enable debug messages for the test utilities.
 Also sends all esup-child log messages to stdout.")
 
-(let* ((current-file (if load-in-progress load-file-name (buffer-file-name)))
-       (source-directory (locate-dominating-file current-file "Cask"))
-       ;; Don't load old byte-compiled versions
-       (load-prefer-newer t))
-  ;; Load the file under test
-  (add-to-list 'load-path source-directory)
-  (load (expand-file-name "esup") nil 'nomessage)
-  (load (expand-file-name "esup-child") nil 'nomessage))
+;; (let* ((current-file (if load-in-progress load-file-name (buffer-file-name)))
+;;        (source-directory (locate-dominating-file current-file "Cask"))
+;;        ;; Don't load old byte-compiled versions
+;;        (load-prefer-newer t))
+;;   ;; Load the file under test
+;;   (add-to-list 'load-path source-directory)
+;;   (load (expand-file-name "esup") nil 'nomessage)
+;;   (load (expand-file-name "esup-child") nil 'nomessage))
+
+(require 'esup)
+(require 'esup-child)
 
 ;;;; Utulity: