summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLitvinov Sergey <slitvinov@gmail.com>2011-07-24 12:28:35 +0200
committerEric Schulte <schulte.eric@gmail.com>2011-07-24 14:05:55 -0600
commit6b6ab138109912f59fcc3f4f3c0d076129213920 (patch)
tree790dbc1bc4da8d7e79eb55f19d8b669765138b71
parentcb973614bd3fb106acf69d4514e09a783bcaf0a2 (diff)
downloadorg-mode-6b6ab138109912f59fcc3f4f3c0d076129213920.tar.gz
Awk can be called with no in-file: and no :stdin
-rw-r--r--lisp/ob-awk.el6
-rw-r--r--testing/README.org1
-rw-r--r--testing/examples/ob-awk-test.in2
-rw-r--r--testing/examples/ob-awk-test.org39
-rw-r--r--testing/lisp/test-ob-awk.el19
5 files changed, 63 insertions, 4 deletions
diff --git a/lisp/ob-awk.el b/lisp/ob-awk.el
index d5098bc..cfed04a 100644
--- a/lisp/ob-awk.el
+++ b/lisp/ob-awk.el
@@ -26,8 +26,7 @@
;;; Commentary:
-;; Babel's awk support relies on two special header argument one of
-;; which is required to pass data to the awk process.
+;; Babel's awk can use special header argument:
;;
;; - :in-file takes a path to a file of data to be processed by awk
;;
@@ -89,11 +88,10 @@ called by `org-babel-execute-src-block'"
(with-temp-file tmp (insert results))
(org-babel-import-elisp-from-file tmp)))))
(cond
- (in-file (org-babel-eval cmd ""))
(stdin (with-temp-buffer
(call-process-shell-command cmd stdin (current-buffer))
(buffer-string)))
- (t (error "ob-awk: must specify either :in-file or :stdin"))))
+ (t (org-babel-eval cmd ""))))
(org-babel-pick-name
(cdr (assoc :colname-names params)) (cdr (assoc :colnames params)))
(org-babel-pick-name
diff --git a/testing/README.org b/testing/README.org
index 3cc0487..2f16a55 100644
--- a/testing/README.org
+++ b/testing/README.org
@@ -78,6 +78,7 @@ First tangle this file out to your desktop.
(org-id-update-id-locations
(list (concat org-dir "/testing/examples/babel.org")
(concat org-dir "/testing/examples/normal.org")
+ (concat org-dir "/testing/examples/ob-awk-test.org")
(concat org-dir "/testing/examples/ob-fortran-test.org")
(concat org-dir "/testing/examples/link-in-heading.org")
(concat org-dir "/testing/examples/links.org")))
diff --git a/testing/examples/ob-awk-test.in b/testing/examples/ob-awk-test.in
new file mode 100644
index 0000000..c38382d
--- /dev/null
+++ b/testing/examples/ob-awk-test.in
@@ -0,0 +1,2 @@
+ # an input file for awk test
+15 \ No newline at end of file
diff --git a/testing/examples/ob-awk-test.org b/testing/examples/ob-awk-test.org
new file mode 100644
index 0000000..7f51772
--- /dev/null
+++ b/testing/examples/ob-awk-test.org
@@ -0,0 +1,39 @@
+#+Title: a collection of examples for ob-awk tests
+#+OPTIONS: ^:nil
+
+* Simple tests
+ :PROPERTIES:
+ :ID: 9e998b2a-3581-43fe-b26d-07d3c507b86a
+ :END:
+Run without input stream
+#+begin_src awk :ouput silent :results silent
+ BEGIN {
+ print 42
+ }
+#+end_src
+
+Use a code block ouput as an input
+#+begin_src awk :stdin genseq :results silent
+ {
+ print 42+$1
+ }
+#+end_src
+
+Use input file
+#+srcname: genfile
+#+begin_src awk :in-file ob-awk-test.in :results silent
+ $0~/[\t]*#/{
+ # skip comments
+ next
+ }
+ {
+ print $1*10
+ }
+#+end_src
+
+* Input data generators
+A code block to generate input stream
+#+srcname: genseq
+#+begin_src emacs-lisp :results silent
+(print "1")
+#+end_src
diff --git a/testing/lisp/test-ob-awk.el b/testing/lisp/test-ob-awk.el
new file mode 100644
index 0000000..018dec4
--- /dev/null
+++ b/testing/lisp/test-ob-awk.el
@@ -0,0 +1,19 @@
+(require 'ob-awk)
+
+(ert-deftest ob-awk/input-none ()
+ "Test with no input file"
+ (org-test-at-id "9e998b2a-3581-43fe-b26d-07d3c507b86a"
+ (org-babel-next-src-block)
+ (should (= 42 (org-babel-execute-src-block)))))
+
+(ert-deftest ob-awk/input-src-block ()
+ "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 ()
+ "Test a code block as an input"
+ (org-test-at-id "9e998b2a-3581-43fe-b26d-07d3c507b86a"
+ (org-babel-next-src-block 3)
+ (should (= 150 (org-babel-execute-src-block)))))