Hi Rick,
Rick Frankel <r...@rickster.com> writes:
> Eric-
>
> After doing a git pull including the rename of ob-sh.el to
> ob-shell.el, testing fails with the error:
>
> Cannot open load file: no such file or directory, ob-sh
The attached patch fixes it but I'll let Eric apply or amend it.
Changes in stash@{0}^2^..stash@{0}
3 files changed, 53 insertions(+), 53 deletions(-)
testing/lisp/test-ob-sh.el | 52 -------------------------------------------
testing/lisp/test-ob-shell.el | 52 +++++++++++++++++++++++++++++++++++++++++++
testing/org-test.el | 2 +-
Deleted testing/lisp/test-ob-sh.el
diff --git a/testing/lisp/test-ob-sh.el b/testing/lisp/test-ob-sh.el
deleted file mode 100644
index 87e2a95..0000000
--- a/testing/lisp/test-ob-sh.el
+++ /dev/null
@@ -1,52 +0,0 @@
-;;; test-ob-sh.el
-
-;; Copyright (c) 2010-2014 Eric Schulte
-;; Authors: Eric Schulte
-
-;; This file is not part of GNU Emacs.
-
-;; This program is free software; you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation, either version 3 of the License, or
-;; (at your option) any later version.
-
-;; This program is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-;; GNU General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with this program. If not, see <http://www.gnu.org/licenses/>.
-
-;;; Comment:
-
-;; Template test file for Org-mode tests
-
-;;; Code:
-(org-test-for-executable "sh")
-(unless (featurep 'ob-shell)
- (signal 'missing-test-dependency "Support for Sh code blocks"))
-
-(ert-deftest test-ob-sh/dont-insert-spaces-on-expanded-bodies ()
- "Expanded shell bodies should not start with a blank line
-unless the body of the tangled block does."
- (should-not (string-match "^[\n\r][\t ]*[\n\r]"
- (org-babel-expand-body:generic "echo 2" '())))
- (should (string-match "^[\n\r][\t ]*[\n\r]"
- (org-babel-expand-body:generic "\n\necho 2" '()))))
-
-(ert-deftest test-ob-sh/dont-error-on-empty-results ()
- "Was throwing an elisp error when shell blocks threw errors and
-returned empty results."
- (should (null (org-babel-execute:sh "ls NoSuchFileOrDirectory.txt" nil))))
-
-(ert-deftest test-ob-sh/session ()
- "This also tests `org-babel-comint-with-output' in
-ob-comint.el, which was not previously tested."
- (let ((res (org-babel-execute:sh "echo 1; echo 2" '((:session . "yes")))))
- (should res)
- (should (listp res))))
-
-(provide 'test-ob-sh)
-
-;;; test-ob-sh.el ends here
New testing/lisp/test-ob-shell.el
diff --git a/testing/lisp/test-ob-shell.el b/testing/lisp/test-ob-shell.el
new file mode 100644
index 0000000..c2f2fa1
--- /dev/null
+++ b/testing/lisp/test-ob-shell.el
@@ -0,0 +1,52 @@
+;;; test-ob-shell.el
+
+;; Copyright (c) 2010-2014 Eric Schulte
+;; Authors: Eric Schulte
+
+;; This file is not part of GNU Emacs.
+
+;; This program is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+;;; Comment:
+
+;; Template test file for Org-mode tests
+
+;;; Code:
+(org-test-for-executable "sh")
+(unless (featurep 'ob-shell)
+ (signal 'missing-test-dependency "Support for Sh code blocks"))
+
+(ert-deftest test-ob-shell/dont-insert-spaces-on-expanded-bodies ()
+ "Expanded shell bodies should not start with a blank line
+unless the body of the tangled block does."
+ (should-not (string-match "^[\n\r][\t ]*[\n\r]"
+ (org-babel-expand-body:generic "echo 2" '())))
+ (should (string-match "^[\n\r][\t ]*[\n\r]"
+ (org-babel-expand-body:generic "\n\necho 2" '()))))
+
+(ert-deftest test-ob-shell/dont-error-on-empty-results ()
+ "Was throwing an elisp error when shell blocks threw errors and
+returned empty results."
+ (should (null (org-babel-execute:sh "ls NoSuchFileOrDirectory.txt" nil))))
+
+(ert-deftest test-ob-shell/session ()
+ "This also tests `org-babel-comint-with-output' in
+ob-comint.el, which was not previously tested."
+ (let ((res (org-babel-execute:sh "echo 1; echo 2" '((:session . "yes")))))
+ (should res)
+ (should (listp res))))
+
+(provide 'test-ob-shell)
+
+;;; test-ob-shell.el ends here
Modified testing/org-test.el
diff --git a/testing/org-test.el b/testing/org-test.el
index c2a9fd4..879d45e 100644
--- a/testing/org-test.el
+++ b/testing/org-test.el
@@ -52,7 +52,7 @@
(require 'org-id)
(require 'ox)
(org-babel-do-load-languages
- 'org-babel-load-languages '((sh . t) (org . t))))
+ 'org-babel-load-languages '((shell . t) (org . t))))
(let* ((load-path (cons
org-test-dir
--
Bastien
