fix windows lib tests (#956)
- add lib-tests path to deps.edn and remove it from shell scripts - change windows lib test batch script to write a bb.edn file - re-enable native lib tests on windows
This commit is contained in:
parent
2282b2922d
commit
a9e445e5a1
5 changed files with 31 additions and 5 deletions
|
|
@ -74,7 +74,7 @@ build_script:
|
||||||
|
|
||||||
call script/test.bat
|
call script/test.bat
|
||||||
|
|
||||||
# call script/run_lib_tests.bat
|
call script/run_lib_tests.bat
|
||||||
|
|
||||||
artifacts:
|
artifacts:
|
||||||
- path: babashka-*-windows-amd64.zip
|
- path: babashka-*-windows-amd64.zip
|
||||||
|
|
|
||||||
2
deps.edn
2
deps.edn
|
|
@ -50,7 +50,7 @@
|
||||||
"-Dclojure.compiler.direct-linking=true"]
|
"-Dclojure.compiler.direct-linking=true"]
|
||||||
:main-opts ["-m" "babashka.profile"]}
|
:main-opts ["-m" "babashka.profile"]}
|
||||||
:lib-tests
|
:lib-tests
|
||||||
{:extra-paths ["process/src" "process/test"]
|
{:extra-paths ["process/src" "process/test" "test-resources/lib_tests"]
|
||||||
:extra-deps {babashka/clj-http-lite
|
:extra-deps {babashka/clj-http-lite
|
||||||
{:git/url "https://github.com/babashka/clj-http-lite"
|
{:git/url "https://github.com/babashka/clj-http-lite"
|
||||||
:sha "f44ebe45446f0f44f2b73761d102af3da6d0a13e"}
|
:sha "f44ebe45446f0f44f2b73761d102af3da6d0a13e"}
|
||||||
|
|
|
||||||
20
script/lib_tests/bb_edn_from_deps.clj
Normal file
20
script/lib_tests/bb_edn_from_deps.clj
Normal file
|
|
@ -0,0 +1,20 @@
|
||||||
|
(ns bb_edn_from_deps
|
||||||
|
(:require [clojure.edn :as edn]
|
||||||
|
[clojure.set :as set]))
|
||||||
|
|
||||||
|
(defn select-deps [m] (select-keys m [:paths :deps]))
|
||||||
|
|
||||||
|
(defn extra-deps [m]
|
||||||
|
(-> m
|
||||||
|
(get-in [:aliases :lib-tests])
|
||||||
|
(set/rename-keys {:extra-deps :deps
|
||||||
|
:extra-paths :paths})
|
||||||
|
select-deps))
|
||||||
|
|
||||||
|
(if (seq *command-line-args*)
|
||||||
|
(->> (slurp "deps.edn")
|
||||||
|
edn/read-string
|
||||||
|
((juxt select-deps extra-deps))
|
||||||
|
(apply merge-with into)
|
||||||
|
(spit (first *command-line-args*)))
|
||||||
|
(println "Please specify an output file"))
|
||||||
|
|
@ -11,5 +11,5 @@ fi
|
||||||
export BABASHKA_CLASSPATH
|
export BABASHKA_CLASSPATH
|
||||||
BABASHKA_CLASSPATH=$(clojure -A:lib-tests -Spath)
|
BABASHKA_CLASSPATH=$(clojure -A:lib-tests -Spath)
|
||||||
|
|
||||||
$BB_CMD -cp "$BABASHKA_CLASSPATH:test-resources/lib_tests" \
|
$BB_CMD -cp "$BABASHKA_CLASSPATH" \
|
||||||
-f "test-resources/lib_tests/babashka/run_all_libtests.clj" "$@"
|
-f "test-resources/lib_tests/babashka/run_all_libtests.clj" "$@"
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,11 @@
|
||||||
if "%BABASHKA_TEST_ENV%" EQU "native" (set BB_CMD=.\bb) else (set BB_CMD=lein bb)
|
if "%BABASHKA_TEST_ENV%" EQU "native" (set BB_CMD=.\bb) else (set BB_CMD=lein bb)
|
||||||
|
|
||||||
for /f %%i in ('.\bb clojure -A:lib-tests -Spath') do set BABASHKA_CLASSPATH=%%i
|
set EDN=lib_tests.edn
|
||||||
|
|
||||||
%BB_CMD% -cp "%BABASHKA_CLASSPATH%;test-resources/lib_tests" -f test-resources/lib_tests/babashka/run_all_libtests.clj %*
|
.\bb -f script/lib_tests/bb_edn_from_deps.clj %EDN%
|
||||||
|
|
||||||
|
set BABASHKA_EDN=%EDN%
|
||||||
|
|
||||||
|
%BB_CMD% -f test-resources/lib_tests/babashka/run_all_libtests.clj %*
|
||||||
|
|
||||||
|
set BABASHKA_EDN=
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue