diff options
author | Eric Schulte <schulte.eric@gmail.com> | 2014-06-06 13:11:46 -0400 |
---|---|---|
committer | Eric Schulte <schulte.eric@gmail.com> | 2014-06-06 13:11:46 -0400 |
commit | 6fb033c791b94b28d052ad77d83e53b36c02bfd6 (patch) | |
tree | 713827477464cea10c12657b8ba480f88a671b7c | |
parent | 7469454f548c38a33632dc8e528dba5fd6876d77 (diff) | |
download | org-mode-6fb033c791b94b28d052ad77d83e53b36c02bfd6.tar.gz |
fix a bug in new ob-awk code
thank you test suite
* lisp/ob-awk.el (org-babel-execute:awk): Don't need to apply the
append, just need to append.
* testing/lisp/test-ob-awk.el (ob-awk/input-src-block-1): Renamed to
avoid name duplication and over-definition.
(ob-awk/input-src-block-2): Renamed to avoid name duplication and
over-definition.
-rw-r--r-- | lisp/ob-awk.el | 16 | ||||
-rw-r--r-- | testing/lisp/test-ob-awk.el | 4 |
2 files changed, 10 insertions, 10 deletions
diff --git a/lisp/ob-awk.el b/lisp/ob-awk.el index 0429fc7..b3d4e28 100644 --- a/lisp/ob-awk.el +++ b/lisp/ob-awk.el @@ -66,14 +66,14 @@ called by `org-babel-execute-src-block'" (insert (org-babel-awk-var-to-awk res))) tmp)))) (cmd (mapconcat #'identity - (apply #'append - (list org-babel-awk-command - "-f" code-file cmd-line) - (mapcar (lambda (pair) - (format "-v %s=%s" - (cadr pair) (cddr pair))) - (org-babel-get-header params :var)) - (list in-file)) + (append + (list org-babel-awk-command + "-f" code-file cmd-line) + (mapcar (lambda (pair) + (format "-v %s=%s" + (cadr pair) (cddr pair))) + (org-babel-get-header params :var)) + (list in-file)) " "))) (org-babel-reassemble-table (let ((results diff --git a/testing/lisp/test-ob-awk.el b/testing/lisp/test-ob-awk.el index 0dec226..3546108 100644 --- a/testing/lisp/test-ob-awk.el +++ b/testing/lisp/test-ob-awk.el @@ -29,13 +29,13 @@ (org-babel-next-src-block) (should (= 42 (org-babel-execute-src-block))))) -(ert-deftest ob-awk/input-src-block () +(ert-deftest ob-awk/input-src-block-1 () "Test a code block as an input" (org-test-at-id "9e998b2a-3581-43fe-b26d-07d3c507b86a" (org-babel-next-src-block 2) (should (= 43 (org-babel-execute-src-block))))) -(ert-deftest ob-awk/input-src-block () +(ert-deftest ob-awk/input-src-block-2 () "Test a code block as an input" (org-test-at-id "9e998b2a-3581-43fe-b26d-07d3c507b86a" (org-babel-next-src-block 3) |