Expect a list of gexps that will be spliced in-place.

The #:setup and #:teardown lists will be a list of gexps that will be spliced
in-place to generate the final code that will be run to setup tests.

If #:setup and #:teardown are not provided, then the `(begin )` that results
is a no-op, therefore this should not cause any troubles.

1 files changed, 2 insertions, 7 deletions

diff --git a/genenetwork-development.scm b/genenetwork-development.scm
index 7eaf915..ef5f858 100644
--- a/genenetwork-development.scm
+++ b/genenetwork-development.scm
@@ -1686,15 +1686,10 @@ delete-test-users, etc.) as the genenetwork user via sudo."
                      (string-append site-packages ":" (getenv "PYTHONPATH")))
                     (setenv "PYTHONPATH" site-packages))
                 (dynamic-wind
-                  (lambda () ;; Run setup if provided
-                    (for-each
-                     (lambda (setup-cmd) (apply invoke setup-cmd))
-                     '#$setup))
+                  (lambda () (begin #$@setup)) ;; Run setup if provided
                   (lambda () (apply invoke '#$test-command)) ;; Run actual tests
                   (lambda () ;; Always run teardowns to clean up.
-                    (for-each
-                     (lambda (teardown-cmd) (apply invoke teardown-cmd))
-                     '#$teardown)
+                    (begin #$@teardown) ;; run if teardowns provided
                     (chdir orig-dir)
                     (delete-file-recursively tmp-dir))))))))))