Fix native-deps test.

technomancy · Aug 16, 2011 · 3b47bfc · 3b47bfc
1 parent 928a6e4
commit 3b47bfc
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/test/leiningen/test/deps.clj b/test/leiningen/test/deps.clj
@@ -4,7 +4,7 @@
         [clojure.test]
         [clojure.java.io :only [file]]
         [leiningen.util.file :only [delete-file-recursively]]
-        [leiningen.util.paths :only [get-os get-arch]]
+        [leiningen.util.paths :only [get-os get-arch native-arch-path]]
         [leiningen.test.helper :only [sample-project dev-deps-project
                                       m2-dir with-no-log native-project]]))
 
@@ -98,5 +98,5 @@
   (delete-file-recursively (:native-path native-project) true)
   (deps native-project)
   (is (= (conj (get-in native-lib-files-map [(get-os) (get-arch)]) ".gitkeep")
-         (set (for [f (rest (file-seq (file (:native-path native-project))))]
+         (set (for [f (rest (file-seq (native-arch-path native-project)))]
                 (.getName f))))))
diff --git a/test_projects/native/.gitignore b/test_projects/native/.gitignore
@@ -1,7 +1,7 @@
 pom.xml
 *jar
 /lib
-/native
+/nnnative
 /classes
 .lein-failures
 .lein-deps-sum
diff --git a/test_projects/native/project.clj b/test_projects/native/project.clj
@@ -1,5 +1,6 @@
 (defproject project-name "1.0.0-SNAPSHOT"
   :description "Test support for transitive native dependencies"
+  :native-path "nnnative"
   :dependencies [[org.clojure/clojure "1.2.1"]
                  [serial-port "1.0.7"]
                  [penumbra/lwjgl "2.4.2"]