emacs-orgmode@gnu.org archives
 help / color / mirror / code / Atom feed
* [BUG] Testing fails after rename of ob-sh
@ 2014-01-16 22:43 Rick Frankel
  2014-01-17 13:29 ` Bastien
  2014-01-17 16:44 ` Achim Gratz
  0 siblings, 2 replies; 7+ messages in thread
From: Rick Frankel @ 2014-01-16 22:43 UTC (permalink / raw)
  To: schulte.eric; +Cc: emacs-orgmode

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

rick

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [BUG] Testing fails after rename of ob-sh
  2014-01-16 22:43 [BUG] Testing fails after rename of ob-sh Rick Frankel
@ 2014-01-17 13:29 ` Bastien
  2014-01-17 16:44 ` Achim Gratz
  1 sibling, 0 replies; 7+ messages in thread
From: Bastien @ 2014-01-17 13:29 UTC (permalink / raw)
  To: Rick Frankel; +Cc: emacs-orgmode, schulte.eric

[-- Attachment #1: Type: text/plain, Size: 299 bytes --]

Hi Rick,

Rick Frankel <rick@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.


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: fix-ob-shell-tests.patch --]
[-- Type: text/x-diff, Size: 5037 bytes --]

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


[-- Attachment #3: Type: text/plain, Size: 14 bytes --]


-- 
 Bastien

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [BUG] Testing fails after rename of ob-sh
  2014-01-16 22:43 [BUG] Testing fails after rename of ob-sh Rick Frankel
  2014-01-17 13:29 ` Bastien
@ 2014-01-17 16:44 ` Achim Gratz
  2014-01-17 17:34   ` Eric Schulte
  1 sibling, 1 reply; 7+ messages in thread
From: Achim Gratz @ 2014-01-17 16:44 UTC (permalink / raw)
  To: emacs-orgmode

Rick Frankel writes:
> 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

What commit were you on before the pull and what branch/commit are you
on now?  Also, what's the output of "make config-test" (if you've added
"sh" to BTEST_OB_LANGUAGES, simply remove it).


Regards,
Achim.
-- 
+<[Q+ Matrix-12 WAVE#46+305 Neuron microQkb Andromeda XTk Blofeld]>+

Wavetables for the Terratec KOMPLEXER:
http://Synth.Stromeko.net/Downloads.html#KomplexerWaves

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [BUG] Testing fails after rename of ob-sh
  2014-01-17 16:44 ` Achim Gratz
@ 2014-01-17 17:34   ` Eric Schulte
  2014-01-17 19:01     ` Rick Frankel
  2014-01-17 19:27     ` Achim Gratz
  0 siblings, 2 replies; 7+ messages in thread
From: Eric Schulte @ 2014-01-17 17:34 UTC (permalink / raw)
  To: Achim Gratz; +Cc: emacs-orgmode

Achim Gratz <Stromeko@nexgo.de> writes:

> Rick Frankel writes:
>> 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
>
> What commit were you on before the pull and what branch/commit are you
> on now?  Also, what's the output of "make config-test" (if you've added
> "sh" to BTEST_OB_LANGUAGES, simply remove it).
>

I believe Achim's suggestion should be the correct one.  See the comment
of the commit making this change.

,----
| commit b319475a86451defbdbac064684dd59fd6b0b7d0
| Author: Eric Schulte <schulte.eric@gmail.com>
| Date:   Fri Dec 13 10:03:05 2013 -0700
| 
|     fix tests with the renamed ob-shell.el
|     
|       Note, users may have to edit their local.mk files to change the
|       value of BTEST_OB_LANGUAGES to remove sh and include shell.
`----

Best,

-- 
Eric Schulte
https://cs.unm.edu/~eschulte
PGP: 0x614CA05D

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [BUG] Testing fails after rename of ob-sh
  2014-01-17 17:34   ` Eric Schulte
@ 2014-01-17 19:01     ` Rick Frankel
  2014-01-17 19:27     ` Achim Gratz
  1 sibling, 0 replies; 7+ messages in thread
From: Rick Frankel @ 2014-01-17 19:01 UTC (permalink / raw)
  To: Eric Schulte; +Cc: Achim Gratz, emacs-orgmode

On 2014-01-17 12:34, Eric Schulte wrote:
> Achim Gratz <Stromeko@nexgo.de> writes:
> 
> What commit were you on before the pull and what branch/commit are you
> on now?  Also, what's the output of "make config-test" (if you've added
> "sh" to BTEST_OB_LANGUAGES, simply remove it).
> 
> 
> I believe Achim's suggestion should be the correct one.  See the 
> comment
> of the commit making this change.
> 
> ,----
> | commit b319475a86451defbdbac064684dd59fd6b0b7d0
> | Author: Eric Schulte <schulte.eric@gmail.com>
> | Date:   Fri Dec 13 10:03:05 2013 -0700
> |
> |     fix tests with the renamed ob-shell.el
> |
> |       Note, users may have to edit their local.mk files to change the
> |       value of BTEST_OB_LANGUAGES to remove sh and include shell.
> `----

Guess I missed that commit message. I looked at the original commit
but not the fix.

FWIW, I ran it with an clean checkout (but copied my old local.mk), so
I guess the issue is that the orginal genaration of local.mk added sh
to the list of languages (i never added it manually).

I think this is going to bite a lot of people using the master branch.

rick

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [BUG] Testing fails after rename of ob-sh
  2014-01-17 17:34   ` Eric Schulte
  2014-01-17 19:01     ` Rick Frankel
@ 2014-01-17 19:27     ` Achim Gratz
  2014-01-18 17:26       ` Eric Schulte
  1 sibling, 1 reply; 7+ messages in thread
From: Achim Gratz @ 2014-01-17 19:27 UTC (permalink / raw)
  To: emacs-orgmode

Eric Schulte writes:
> I believe Achim's suggestion should be the correct one.  See the comment
> of the commit making this change.

The part of Bastiens patch changing

     (org-babel-do-load-languages
       'org-babel-load-languages '((sh . t) (org . t))))

to
       
     (org-babel-do-load-languages
       'org-babel-load-languages '((shell . t) (org . t))))

looks like a good fix, though.


Regards,
Achim.
-- 
+<[Q+ Matrix-12 WAVE#46+305 Neuron microQkb Andromeda XTk Blofeld]>+

SD adaptations for KORG EX-800 and Poly-800MkII V0.9:
http://Synth.Stromeko.net/Downloads.html#KorgSDada

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [BUG] Testing fails after rename of ob-sh
  2014-01-17 19:27     ` Achim Gratz
@ 2014-01-18 17:26       ` Eric Schulte
  0 siblings, 0 replies; 7+ messages in thread
From: Eric Schulte @ 2014-01-18 17:26 UTC (permalink / raw)
  To: Achim Gratz; +Cc: emacs-orgmode

Achim Gratz <Stromeko@nexgo.de> writes:

> Eric Schulte writes:
>> I believe Achim's suggestion should be the correct one.  See the comment
>> of the commit making this change.
>
> The part of Bastiens patch changing
>
>      (org-babel-do-load-languages
>        'org-babel-load-languages '((sh . t) (org . t))))
>
> to
>        
>      (org-babel-do-load-languages
>        'org-babel-load-languages '((shell . t) (org . t))))
>
> looks like a good fix, though.
>

Applied, Thanks.

>
>
> Regards,
> Achim.

-- 
Eric Schulte
https://cs.unm.edu/~eschulte
PGP: 0x614CA05D

^ permalink raw reply	[flat|nested] 7+ messages in thread

end of thread, other threads:[~2014-01-18 20:44 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-01-16 22:43 [BUG] Testing fails after rename of ob-sh Rick Frankel
2014-01-17 13:29 ` Bastien
2014-01-17 16:44 ` Achim Gratz
2014-01-17 17:34   ` Eric Schulte
2014-01-17 19:01     ` Rick Frankel
2014-01-17 19:27     ` Achim Gratz
2014-01-18 17:26       ` Eric Schulte

Code repositories for project(s) associated with this inbox:

	https://git.savannah.gnu.org/cgit/emacs/org-mode.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).