mirror of
https://git.savannah.gnu.org/git/emacs/org-mode.git
synced 2024-12-11 09:20:32 +00:00
3c7e75ab0b
* lisp/ob-shell.el: added support to serialize vars as arrays or associative arrays as appropriate if it is using bash. * testing/examples/ob-shell-test.org: a file containing a few code blocks both illustrating the use of arrays as well as serving as test for the new export functionality. * testing/lisp/test-ob-shell.el: added a few unit tests that verify that this new logic only triggers for bash and no other shell at this time. When variables are defined in a 'sh' code block, they are exported as strings. when the variable itself is an array or a table, then we simply get a shell variable that contains the list of all values in a non-structured form. When calling the code block with bash, however, it will now export the list as an array, the table as an associative array. A scalar is exported the same way as before. Signed-off-by: Pascal Fleury <fleury@google.com>
93 lines
3.4 KiB
EmacsLisp
93 lines
3.4 KiB
EmacsLisp
;;; 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 Shell 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))))
|
|
|
|
; A list of tests using the samples in ob-shell-test.org
|
|
(ert-deftest ob-shell/generic-uses-no-arrays ()
|
|
"No arrays for generic"
|
|
(org-test-at-id "0ba56632-8dc1-405c-a083-c204bae477cf"
|
|
(org-babel-next-src-block)
|
|
(should (equal "one two three" (org-babel-execute-src-block)))))
|
|
|
|
(ert-deftest ob-shell/bash-uses-arrays ()
|
|
"Bash arrays"
|
|
(org-test-at-id "0ba56632-8dc1-405c-a083-c204bae477cf"
|
|
(org-babel-next-src-block 2)
|
|
(should (equal "one" (org-babel-execute-src-block)))))
|
|
|
|
(ert-deftest ob-shell/generic-uses-no-assoc-arrays ()
|
|
"No associative arrays for generic"
|
|
(org-test-at-id "bec1a5b0-4619-4450-a8c0-2a746b44bf8d"
|
|
(org-babel-next-src-block)
|
|
(should (equal "first one second two third three"
|
|
(org-babel-execute-src-block)))))
|
|
|
|
(ert-deftest ob-shell/bash-uses-assoc-arrays ()
|
|
"Bash associative arrays"
|
|
(org-test-at-id "bec1a5b0-4619-4450-a8c0-2a746b44bf8d"
|
|
(org-babel-next-src-block 2)
|
|
(should (equal "two" (org-babel-execute-src-block)))))
|
|
|
|
(ert-deftest ob-shell/generic-uses-no-assoc-arrays ()
|
|
"No associative arrays for generic"
|
|
(org-test-at-id "82320a48-3409-49d7-85c9-5de1c6d3ff87"
|
|
(org-babel-next-src-block)
|
|
(should (equal "bread 2 kg spaghetti 20 cm milk 50 dl"
|
|
(org-babel-execute-src-block)))))
|
|
|
|
(ert-deftest ob-shell/bash-uses-assoc-arrays ()
|
|
"Bash associative arrays as strings for the row"
|
|
(org-test-at-id "82320a48-3409-49d7-85c9-5de1c6d3ff87"
|
|
(org-babel-next-src-block 2)
|
|
(should (equal "20 cm" (org-babel-execute-src-block)))))
|
|
|
|
|
|
(provide 'test-ob-shell)
|
|
|
|
;;; test-ob-shell.el ends here
|