Combine the :test-clj and :test-cljs profiles

Author: cichli

.travis.yml

@@ -8,12 +8,9 @@ script:
   - make $TARGET
 env:
   matrix:
-    - CLOJURE_VERSION=1.8 TARGET=test-clj
-    - CLOJURE_VERSION=1.8 TARGET=test-cljs
-    - CLOJURE_VERSION=1.9 TARGET=test-clj
-    - CLOJURE_VERSION=1.9 TARGET=test-cljs
-    - CLOJURE_VERSION=1.10 TARGET=test-clj
-    - CLOJURE_VERSION=1.10 TARGET=test-cljs
+    - CLOJURE_VERSION=1.8 TARGET=test
+    - CLOJURE_VERSION=1.9 TARGET=test
+    - CLOJURE_VERSION=1.10 TARGET=test
   global:
     - secure: "bCp4gU7XgeqLnqKwEpJarnKPbGljHyLE2rZnub4mEHD8kcvh6LoEkG/2QCtnSETj8zrQJwyMuEDGUwPgjmzQ/aEn6UiIYmv7ka6QnLBxOxhqQTbDtG7HssfkeT5b67LgOyQX7ejK88vnmH+OeWXM7kOOvUwVy5BVgsYyr2f1cGU="
     - secure: "D2Ie7dUZ9nQOIWtkRl2XWZeijSL8expUXP3GziSqQV1scJzwexxnUsRvWOkc2YU8+6IIGz9tcyt9RrEFUVF31VZgRSHh8P5rGGCzI2l99djKhYFfSErElwgoAJZFtOzougZK66/Gtb5uDo5L/wlKHkl4st3miqm+mEvfJITDjRQ="
@@ -36,9 +33,7 @@ stages:
 jobs:
   include:
     # Test Clojure master against a single JDK
-    - env: CLOJURE_VERSION=master TARGET=test-clj
-      jdk: openjdk11
-    - env: CLOJURE_VERSION=master TARGET=test-cljs
+    - env: CLOJURE_VERSION=master TARGET=test
       jdk: openjdk11
 
     # Coverage analysis
@@ -63,7 +58,6 @@ jobs:
 
   fast_finish: true      # don't wait for allowed failures before build finish
   allow_failures:
-    - env: CLOJURE_VERSION=master TARGET=test-clj
-    - env: CLOJURE_VERSION=master TARGET=test-cljs
+    - env: CLOJURE_VERSION=master TARGET=test
     - env: CLOJURE_VERSION=1.10 TARGET=cloverage
     - jdk: openjdk-ea

Makefile

@@ -1,4 +1,4 @@
-.PHONY: test-clj test-cljs eastwood cljfmt cloverage install smoketest release deploy clean detect_timeout
+.PHONY: test eastwood cljfmt cloverage install smoketest release deploy clean detect_timeout
 
 CLOJURE_VERSION ?= 1.9
 export CLOVERAGE_VERSION = 1.0.13
@@ -12,17 +12,14 @@ JAVA_VERSION = $(shell lein with-profile +sysutils \
 
 source-deps: .source-deps
 
-test-clj: .source-deps smoketest
-	lein with-profile +$(CLOJURE_VERSION),+plugin.mranderson/config,+test-clj test
-
-test-cljs: .source-deps
-	lein with-profile +$(CLOJURE_VERSION),+plugin.mranderson/config,+test-cljs test
+test: .source-deps smoketest
+	lein with-profile +$(CLOJURE_VERSION),+plugin.mranderson/config test
 
 eastwood:
-	lein with-profile +$(CLOJURE_VERSION),+test-clj,+test-cljs,+eastwood eastwood
+	lein with-profile +$(CLOJURE_VERSION),+eastwood eastwood
 
 cljfmt:
-	lein with-profile +$(CLOJURE_VERSION),+test-clj,+test-cljs,+cljfmt cljfmt check
+	lein with-profile +$(CLOJURE_VERSION),+cljfmt cljfmt check
 
 
 # Cloverage can't handle some of the code in this project.  For now we
@@ -31,7 +28,7 @@ cljfmt:
 # exact. See issue #457 for details.
 
 cloverage:
-	lein with-profile +$(CLOJURE_VERSION),+test-clj,+test-cljs,+cloverage cloverage --codecov \
+	lein with-profile +$(CLOJURE_VERSION),+cloverage cloverage --codecov \
 	     -e ".*util.instrument" \
 	     -t "^((?!debug-integration-test).)*$$"
 

project.clj

@@ -28,7 +28,9 @@
 
   :filespecs [{:type :bytes :path "cider/cider-nrepl/project.clj" :bytes ~(slurp "project.clj")}]
 
-  :test-paths ["test/common"] ;; See `test-clj` and `test-cljs` profiles below.
+  :source-paths ["src"]
+  :resource-paths ["resources"]
+  :test-paths ["test/clj" "test/cljs" "test/common"]
 
   :test-selectors {:default (fn [test-meta]
                               (let [parse-version (fn [v] (mapv #(Integer/parseInt (re-find #"\d+" %)) (clojure.string/split v #"\.")))
@@ -57,16 +59,16 @@
 
   :profiles {:provided {:dependencies [[org.clojure/clojure "1.8.0"]]}
 
-             :dev {:dependencies [;; For developing the Leiningen plugin.
-                                  [leiningen-core "2.8.3"]
-                                  ;; For the boot tasks namespace
-                                  [boot/base "2.8.2"]
-                                  [boot/core "2.8.2"]]}
+             :dev {:dependencies [[boot/base "2.8.2"]
+                                  [boot/core "2.8.2"]
+                                  [leiningen-core "2.8.3"]]}
 
              :1.8 {:dependencies [[org.clojure/clojure "1.8.0"]
-                                  [org.clojure/clojurescript "1.8.51" :scope "provided"]]}
+                                  [org.clojure/clojurescript "1.8.51" :scope "provided"]
+                                  [javax.xml.bind/jaxb-api "2.3.1" :scope "provided"]]}
              :1.9 {:dependencies [[org.clojure/clojure "1.9.0"]
-                                  [org.clojure/clojurescript "1.9.946" :scope "provided"]]
+                                  [org.clojure/clojurescript "1.9.946" :scope "provided"]
+                                  [javax.xml.bind/jaxb-api "2.3.1" :scope "provided"]]
                    :test-paths ["test/spec"]}
              :1.10 {:dependencies [[org.clojure/clojure "1.10.0"]
                                    [org.clojure/clojurescript "1.10.63" :scope "provided"]]
@@ -75,13 +77,10 @@
                       :dependencies [[org.clojure/clojure "1.11.0-master-SNAPSHOT"]
                                      [org.clojure/clojurescript "1.10.439" :scope "provided"]]}
 
-             :test-clj {:source-paths ["test/src"]
-                        :java-source-paths ["test/java"]
-                        :resource-paths ["test/resources"]
-                        :test-paths ["test/clj"]}
-             :test-cljs {:test-paths ["test/cljs"]
-                         :dependencies [[cider/piggieback "0.3.10"]
-                                        [javax.xml.bind/jaxb-api "2.3.1"]]}
+             :test {:source-paths ["test/src"]
+                    :java-source-paths ["test/java"]
+                    :resource-paths ["test/resources"]
+                    :dependencies [[cider/piggieback "0.3.10"]]}
 
              :repl {:repl-options {:nrepl-middleware [cider.nrepl/wrap-apropos
                                                       cider.nrepl/wrap-classpath