Merge from emacs-24; up to 2014-06-11T19:33:[email protected]

3 files changed, 16 insertions, 3 deletions

diff --git a/test/ChangeLog b/test/ChangeLog
index 01cd55d99d..ffa0aaead4 100644
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -1,3 +1,9 @@
+2014-06-26  Stefan Monnier  <[email protected]>
+
+	* automated/package-test.el (package-test-update-listing)
+	(package-test-update-archives, package-test-describe-package):
+	Adjust tests according to new package-list-unsigned.
+
 2014-06-26  Glenn Morris  <[email protected]>
 
 	* automated/ert-tests.el (no-byte-compile): Set it.  (Bug#17851)
diff --git a/test/automated/package-test.el b/test/automated/package-test.el
index e7c989de57..b970cd7c9f 100644
--- a/test/automated/package-test.el
+++ b/test/automated/package-test.el
@@ -265,7 +265,7 @@ Must called from within a `tar-mode' buffer."
       (should (package-installed-p 'simple-single))
       (switch-to-buffer "*Packages*")
       (goto-char (point-min))
-      (should (re-search-forward "^\\s-+simple-single\\s-+1.3\\s-+unsigned" nil t))
+      (should (re-search-forward "^\\s-+simple-single\\s-+1.3\\s-+installed" nil t))
       (goto-char (point-min))
       (should-not (re-search-forward "^\\s-+simple-single\\s-+1.3\\s-+\\(available\\|new\\)" nil t))
       (kill-buffer buf))))
@@ -287,7 +287,7 @@ Must called from within a `tar-mode' buffer."
         ;; New version should be available and old version should be installed
         (goto-char (point-min))
         (should (re-search-forward "^\\s-+simple-single\\s-+1.4\\s-+new" nil t))
-        (should (re-search-forward "^\\s-+simple-single\\s-+1.3\\s-+unsigned" nil t))
+        (should (re-search-forward "^\\s-+simple-single\\s-+1.3\\s-+installed" nil t))
 
         (goto-char (point-min))
         (should (re-search-forward "^\\s-+new-pkg\\s-+1.0\\s-+\\(available\\|new\\)" nil t))
@@ -318,7 +318,7 @@ Must called from within a `tar-mode' buffer."
     (with-fake-help-buffer
      (describe-package 'simple-single)
      (goto-char (point-min))
-     (should (search-forward "simple-single is an unsigned package." nil t))
+     (should (search-forward "simple-single is an installed package." nil t))
      (should (search-forward
               (format "Status: Installed in `%s/' (unsigned)."
                       (expand-file-name "simple-single-1.3" package-user-dir))
diff --git a/test/indent/shell.sh b/test/indent/shell.sh
index 8e831bb8f1..4a30739e2d 100755
--- a/test/indent/shell.sh
+++ b/test/indent/shell.sh
@@ -41,6 +41,13 @@ for foo in bar; do              #  bug#17721
     }
 done
 
+filter_3 ()                     # bug#17842
+{
+    tr -d '"`' | tr '	' ' ' | \
+        awk -F\; -f filter.awk | \
+	grep -v "^," | sort -t, -k2,2
+}
+
 echo -n $(( 5 << 2 ))
 # This should not be treated as a heredoc (bug#12770).
 2