From 0019cc9c14087dcbc723926dface2251f398b898 Mon Sep 17 00:00:00 2001 From: Eric Schulte Date: Sun, 14 Jun 2009 10:23:44 -0700 Subject: [PATCH] all tests seem to be passing --- lisp/org-babel.el | 1 + org-babel.org | 92 +++++++++++++++++++++++------------------------ 2 files changed, 47 insertions(+), 46 deletions(-) diff --git a/lisp/org-babel.el b/lisp/org-babel.el index 0a44a4dc2..652626f9f 100644 --- a/lisp/org-babel.el +++ b/lisp/org-babel.el @@ -127,6 +127,7 @@ the header arguments specified at the source code block." (error "Language is not in `org-babel-interpreters': %s" lang)) (setq result (funcall cmd body params)) ;; possibly force result into a vector + (message "with %s result %S" lang result) (if (and (not (listp result)) (cdr (assoc :results params)) (member "vector" (split-string (cdr (assoc :results params))))) (setq result (list result))) diff --git a/org-babel.org b/org-babel.org index f3219ac72..59e304c74 100644 --- a/org-babel.org +++ b/org-babel.org @@ -2035,52 +2035,52 @@ org-babel functionality. of these tests may fail. #+TBLNAME: org-babel-tests -| functionality | block | arg | expected | results | pass | -|-------------------------+----------------------------+-----+-------------+-------------+----------------------------| -| basic evaluation | | | | | pass | -|-------------------------+----------------------------+-----+-------------+-------------+----------------------------| -| emacs lisp | basic-elisp | | 5 | 5 | pass | -| shell | basic-shell | | 6 | 6 | pass | -| ruby | basic-ruby | | org-babel | org-babel | pass | -| python | basic-python | | hello world | hello world | pass | -| R | basic-R | | 13 | 13 | pass | -|-------------------------+----------------------------+-----+-------------+-------------+----------------------------| -| tables | | | | | pass | -|-------------------------+----------------------------+-----+-------------+-------------+----------------------------| -| emacs lisp | table-elisp | | 3 | 3 | pass | -| ruby | table-ruby | | 1-2-3 | 1-2-3 | pass | -| python | table-python | | 5 | 5 | pass | -| R | table-R | | 3.5 | 3.5 | pass | -|-------------------------+----------------------------+-----+-------------+-------------+----------------------------| -| source block references | | | | | pass | -|-------------------------+----------------------------+-----+-------------+-------------+----------------------------| -| all languages | chained-ref-last | | Array | Array | pass | -|-------------------------+----------------------------+-----+-------------+-------------+----------------------------| -| source block functions | | | | | pass | -|-------------------------+----------------------------+-----+-------------+-------------+----------------------------| -| emacs lisp | defun-fibb | | fibbd | fibbd | pass | -| run over | Fibonacci | 0 | 1 | 1 | pass | -| a | Fibonacci | 1 | 1 | 1 | pass | -| variety | Fibonacci | 2 | 2 | 2 | pass | -| of | Fibonacci | 3 | 3 | 3 | pass | -| different | Fibonacci | 4 | 5 | 5 | pass | -| arguments | Fibonacci | 5 | 8 | 8 | pass | -|-------------------------+----------------------------+-----+-------------+-------------+----------------------------| -| bugs and tasks | | | | | pass | -|-------------------------+----------------------------+-----+-------------+-------------+----------------------------| -| simple ruby arrays | ruby-array-test | | 3 | nil | expected "3" but was "nil" | -| R number evaluation | bug-R-number-evaluation | | 2 | 2 | pass | -| multi-line ruby blocks | multi-line-ruby-test | | 2 | 2 | pass | -| forcing vector results | test-forced-vector-results | | Array | Array | pass | -|-------------------------+----------------------------+-----+-------------+-------------+----------------------------| -| sessions | | | | | pass | -|-------------------------+----------------------------+-----+-------------+-------------+----------------------------| -| set ruby session | set-ruby-session-var | | :set | :set | pass | -| get from ruby session | get-ruby-session-var | | 3 | 3 | pass | -| set python session | set-python-session-var | | set | set | pass | -| get from python session | get-python-session-var | | 4 | 4 | pass | -| set R session | set-R-session-var | | set | set | pass | -| get from R session | get-R-session-var | | 5 | 5 | pass | +| functionality | block | arg | expected | results | pass | +|-------------------------+----------------------------+-----+-------------+-------------+------| +| basic evaluation | | | | | pass | +|-------------------------+----------------------------+-----+-------------+-------------+------| +| emacs lisp | basic-elisp | | 5 | 5 | pass | +| shell | basic-shell | | 6 | 6 | pass | +| ruby | basic-ruby | | org-babel | org-babel | pass | +| python | basic-python | | hello world | hello world | pass | +| R | basic-R | | 13 | 13 | pass | +|-------------------------+----------------------------+-----+-------------+-------------+------| +| tables | | | | | pass | +|-------------------------+----------------------------+-----+-------------+-------------+------| +| emacs lisp | table-elisp | | 3 | 3 | pass | +| ruby | table-ruby | | 1-2-3 | 1-2-3 | pass | +| python | table-python | | 5 | 5 | pass | +| R | table-R | | 3.5 | 3.5 | pass | +|-------------------------+----------------------------+-----+-------------+-------------+------| +| source block references | | | | | pass | +|-------------------------+----------------------------+-----+-------------+-------------+------| +| all languages | chained-ref-last | | Array | Array | pass | +|-------------------------+----------------------------+-----+-------------+-------------+------| +| source block functions | | | | | pass | +|-------------------------+----------------------------+-----+-------------+-------------+------| +| emacs lisp | defun-fibb | | fibbd | fibbd | pass | +| run over | Fibonacci | 0 | 1 | 1 | pass | +| a | Fibonacci | 1 | 1 | 1 | pass | +| variety | Fibonacci | 2 | 2 | 2 | pass | +| of | Fibonacci | 3 | 3 | 3 | pass | +| different | Fibonacci | 4 | 5 | 5 | pass | +| arguments | Fibonacci | 5 | 8 | 8 | pass | +|-------------------------+----------------------------+-----+-------------+-------------+------| +| bugs and tasks | | | | | pass | +|-------------------------+----------------------------+-----+-------------+-------------+------| +| simple ruby arrays | ruby-array-test | | 3 | 3 | pass | +| R number evaluation | bug-R-number-evaluation | | 2 | 2 | pass | +| multi-line ruby blocks | multi-line-ruby-test | | 2 | 2 | pass | +| forcing vector results | test-forced-vector-results | | Array | Array | pass | +|-------------------------+----------------------------+-----+-------------+-------------+------| +| sessions | | | | | pass | +|-------------------------+----------------------------+-----+-------------+-------------+------| +| set ruby session | set-ruby-session-var | | :set | :set | pass | +| get from ruby session | get-ruby-session-var | | 3 | 3 | pass | +| set python session | set-python-session-var | | set | set | pass | +| get from python session | get-python-session-var | | 4 | 4 | pass | +| set R session | set-R-session-var | | set | set | pass | +| get from R session | get-R-session-var | | 5 | 5 | pass | #+TBLFM: $5='(if (= (length $3) 1) (progn (message (format "running %S" '(sbe $2 (n $3)))) (sbe $2 (n $3))) (sbe $2))::$6='(if (string= $4 $5) "pass" (format "expected %S but was %S" $4 $5)) ** basic tests