* test/automated/package-x-test.el: Do not mess with load-path.

2 files changed, 3 insertions, 16 deletions

diff --git a/test/ChangeLog b/test/ChangeLog
index fbbc0f9de51..7ad0e9a4b9d 100644
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -1,5 +1,7 @@
 2014-06-26  Glenn Morris  <rgm@gnu.org>
 
+        * automated/package-x-test.el: Do not mess with load-path.
+
         * automated/Makefile.in (%.log): If error, dump log to stdout.
 
 2014-06-26  Stefan Monnier  <monnier@iro.umontreal.ca>
diff --git a/test/automated/package-x-test.el b/test/automated/package-x-test.el
index cce51b63561..d58915e7c7b 100644
--- a/test/automated/package-x-test.el
+++ b/test/automated/package-x-test.el
@@ -22,27 +22,12 @@
 
 ;;; Commentary:
 
-;; You may want to run this from a separate Emacs instance from your
-;; main one, because a bug in the code below could mess with your
-;; installed packages.
-
-;; Run this in a clean Emacs session using:
-;;
-;;     $ emacs -Q --batch -L . -l package-x-test.el -f ert-run-tests-batch-and-exit
-
 ;;; Code:
 
 (require 'package-x)
 (require 'ert)
 (require 'cl-lib)
-(eval-when-compile (require 'package-test))
-
-;; package-test is not normally in `load-path', so temporarily set
-;; `load-path' to contain the current directory.
-(let ((load-path (append (list (file-name-directory (or load-file-name
-                                                        buffer-file-name)))
-                         load-path)))
-  (require 'package-test))
+(require 'package-test)
 
 (defvar package-x-test--single-archive-entry-1-3
   (cons 'simple-single