diff --git a/test/leiningen/test/helper.clj b/test/leiningen/test/helper.clj index 75943db9..f657c5de 100644 --- a/test/leiningen/test/helper.clj +++ b/test/leiningen/test/helper.clj @@ -9,9 +9,20 @@ (io/file local-repo (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] - (binding [*ns* (find-ns 'leiningen.core)] - (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")) diff --git a/test/leiningen/test/run.clj b/test/leiningen/test/run.clj index 66bea8ea..bafedd57 100644 --- a/test/leiningen/test/run.clj +++ b/test/leiningen/test/run.clj @@ -38,4 +38,4 @@ ;; TODO: re-enable ;; (deftest test-run-java-main ;; (javac dev-deps-project) -;; (is (zero? (run dev-deps-project)))) \ No newline at end of file +;; (is (zero? (run dev-deps-project)))) diff --git a/test_projects/sample_no_aot/project.clj b/test_projects/sample_no_aot/project.clj index 28f75346..3c4239e8 100644 --- a/test_projects/sample_no_aot/project.clj +++ b/test_projects/sample_no_aot/project.clj @@ -4,7 +4,7 @@ ;; "lein new". (defproject nomnomnom "0.5.0-SNAPSHOT" - :dependencies [[clojure "1.2.0"] + :dependencies [[org.clojure/clojure "1.2.0"] [janino "2.5.15"]] :uberjar-exclusions [#"DUMMY"] :test-selectors {:default (fn [m] (not (:integration m))) diff --git a/test_projects/tricky-name/project.clj b/test_projects/tricky-name/project.clj index 059442b6..b09a61cd 100644 --- a/test_projects/tricky-name/project.clj +++ b/test_projects/tricky-name/project.clj @@ -1,6 +1,6 @@ (defproject org.domain/tricky-name "1.0" :description "One with a tricky group and project name" - :dev-dependencies [[clojure "1.2.0"]] + :dev-dependencies [[org.clojure/clojure "1.2.0"]] :shell-wrapper true :main ^{:skip-aot true} org.domain.tricky-name.core :run-aliases {:bbb org.domain.tricky-name.brunch