yogsototh/leiningen
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update tests for compile tests

Browse source 
The classpath was changed to use absolute paths for the checkout
dependencies.  They were pointing to the wrong directory since the
working directory would be the leiningen project instead of the
test project.

This adds the absolute paths for test projects back, as just
changing the classpath does not help for the other tasks.
This commit is contained in:
Nelson Morris 2011-12-02 22:52:49 -06:00
parent 24a89ee1d7
commit 5184b8017e
3 changed files with 18 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
leiningen-core/src/leiningen/core/classpath.clj
View file

@ -23,7 +23,7 @@
(for [d (:checkout-deps-shares project [:source-path (for [d (:checkout-deps-shares project [:source-path
:compile-path :compile-path
:resources-path])] :resources-path])]
(str (io/file "checkouts" (.getName dep) (d proj))))))) (str (io/file (:root project) "checkouts" (.getName dep) (d proj)))))))
(defn resolve-dependencies (defn resolve-dependencies
"Simply delegate regular dependencies to pomegranate. This will "Simply delegate regular dependencies to pomegranate. This will

8
test/leiningen/test/compile.clj
View file

@ -3,8 +3,8 @@
(:use [clojure.test] (:use [clojure.test]
[clojure.java.io :only [file]] [clojure.java.io :only [file]]
[clojure.java.shell :only [with-sh-dir]] [clojure.java.shell :only [with-sh-dir]]
[leiningen.core.eval :only [eval-in-project]]
[leiningen.compile] [leiningen.compile]
[leiningen.core :only [read-project]]
[leiningen.test.helper :only [sample-project sample-failing-project [leiningen.test.helper :only [sample-project sample-failing-project
tricky-name-project dev-deps-project]] tricky-name-project dev-deps-project]]
[leiningen.util.file :only [delete-file-recursively]])) [leiningen.util.file :only [delete-file-recursively]]))
@ -23,8 +23,8 @@
(is (pos? (compile sample-failing-project)))) (is (pos? (compile sample-failing-project))))
(deftest test-plugin (deftest test-plugin
(is (zero? (eval-in-project (assoc sample-project (is (= :compiled (eval-in-project (assoc sample-project
:eval-in-leiningen true :eval-in :leiningen
:skip-shutdown-agents true :skip-shutdown-agents true
:main nil) :main nil)
'(do (require 'leiningen.compile) '(do (require 'leiningen.compile)
@ -66,7 +66,7 @@
(deftest test-injection (deftest test-injection
(is (zero? (eval-in-project sample-project (is (zero? (eval-in-project sample-project
'#'leiningen.util.injected/add-hook)))) '#'leiningen.core.injected/add-hook))))
(deftest test-compile-java-main (deftest test-compile-java-main
(is (zero? (compile dev-deps-project)))) (is (zero? (compile dev-deps-project))))

13
test/leiningen/test/helper.clj
View file

@ -8,9 +8,20 @@
(defn m2-dir [n v] (defn m2-dir [n v]
(io/file local-repo (io/file local-repo
(if (string? n) n (or (namespace n) (name n))) (name n) v)) (if (string? n) n (or (namespace n) (name n))) (name n) v))
(defn- prepend-root [project key root]
(assoc project key (str root java.io.File/separator (key project))))
(defn- read-test-project [name] (defn- read-test-project [name]
(project/read (format "test_projects/%s/project.clj" name))) (let [project (project/read (format "test_projects/%s/project.clj" name))
root (:root project)]
(-> project
(prepend-root :source-path root)
(prepend-root :compile-path root)
(prepend-root :test-path root)
(prepend-root :resources-path root)
(prepend-root :dev-resources-path root)
(prepend-root :target-path root)
(prepend-root :native-path root))))
(def sample-project (read-test-project "sample")) (def sample-project (read-test-project "sample"))