Try to fix reading of sample projects in leiningen.test.helper.
Still broken unfortunately; getting inexplicable NPE out of resolve.
This commit is contained in:
parent
708a586242
commit
7ff6478f5a
2 changed files with 8 additions and 18 deletions
|
@ -59,7 +59,7 @@
|
||||||
(let [project (resolve 'leiningen.core.project/project)]
|
(let [project (resolve 'leiningen.core.project/project)]
|
||||||
(when-not project
|
(when-not project
|
||||||
(throw (Exception. "project.clj must define project map.")))
|
(throw (Exception. "project.clj must define project map.")))
|
||||||
(ns-unmap *ns* 'project) ; return it to original state
|
;; (ns-unmap *ns* 'project) ; return it to original state
|
||||||
@project)
|
@project)
|
||||||
(catch java.io.FileNotFoundException _)))
|
(catch java.io.FileNotFoundException _)))
|
||||||
([] (read "project.clj")))
|
([] (read "project.clj")))
|
||||||
|
|
|
@ -1,18 +1,17 @@
|
||||||
(ns leiningen.test.helper
|
(ns leiningen.test.helper
|
||||||
(:require [lancet.core :as lancet])
|
(:require [leiningen.core.project :as project]
|
||||||
(:use [clojure.java.io :only [file]]
|
[clojure.java.io :as io]))
|
||||||
[leiningen.compile :only [platform-nullsink]]
|
|
||||||
[leiningen.core :only [read-project]]
|
|
||||||
[leiningen.util.maven :only [make-local-repo]]))
|
|
||||||
|
|
||||||
(def local-repo (.getBasedir (make-local-repo)))
|
;; TODO: fix
|
||||||
|
(def local-repo (io/file (System/getProperty "user.home") ".m2" "repository"))
|
||||||
|
|
||||||
(defn m2-dir [n v]
|
(defn m2-dir [n v]
|
||||||
(file local-repo (if (string? n) n (or (namespace n) (name n))) (name n) v))
|
(io/file local-repo
|
||||||
|
(if (string? n) n (or (namespace n) (name n))) (name n) v))
|
||||||
|
|
||||||
(defn- read-test-project [name]
|
(defn- read-test-project [name]
|
||||||
(binding [*ns* (find-ns 'leiningen.core)]
|
(binding [*ns* (find-ns 'leiningen.core)]
|
||||||
(read-project (format "test_projects/%s/project.clj" name))))
|
(project/read (format "test_projects/%s/project.clj" name))))
|
||||||
|
|
||||||
(def sample-project (read-test-project "sample"))
|
(def sample-project (read-test-project "sample"))
|
||||||
|
|
||||||
|
@ -25,12 +24,3 @@
|
||||||
(def tricky-name-project (read-test-project "tricky-name"))
|
(def tricky-name-project (read-test-project "tricky-name"))
|
||||||
|
|
||||||
(def native-project (read-test-project "native"))
|
(def native-project (read-test-project "native"))
|
||||||
|
|
||||||
(def logger (first (.getBuildListeners lancet/ant-project)))
|
|
||||||
|
|
||||||
(defmacro with-no-log [& body]
|
|
||||||
`(do (.setOutputPrintStream logger (platform-nullsink))
|
|
||||||
(.setErrorPrintStream logger (platform-nullsink))
|
|
||||||
(try ~@body
|
|
||||||
(finally (.setOutputPrintStream logger System/out)
|
|
||||||
(.setErrorPrintStream logger System/err)))))
|
|
||||||
|
|
Loading…
Reference in a new issue