diff --git a/appveyor.yml b/appveyor.yml index 7e60e61c..c051030f 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -68,12 +68,16 @@ build_script: jar -cMf %zip% bb.exe bb --config .build/bb.edn --deps-root . release-artifact %zip% - + +before_test: +- cmd: >- set BABASHKA_CLASSPATH= set BABASHKA_TEST_ENV=native - - call script/test.bat + +test_script: +- cmd: >- + call script/test.bat :windows call script/run_lib_tests.bat diff --git a/project.clj b/project.clj index e3c3672e..79440e63 100644 --- a/project.clj +++ b/project.clj @@ -16,9 +16,10 @@ ;; :java-source-paths ["sci/reflector/src-java"] :java-source-paths ["src-java"] :resource-paths ["resources" "sci/resources"] - :test-selectors {:default (complement :windows-only) - :windows (complement :skip-windows) - :non-flaky (complement :flaky)} + :test-selectors {:default (complement (some-fn :windows-only :flaky)) + :windows (complement (some-fn :skip-windows :flaky)) + :non-flaky (complement :flaky) + :flaky :flaky} :dependencies [[org.clojure/clojure "1.11.1"] [borkdude/edamame "1.1.17"] [borkdude/graal.locking "0.0.2"] diff --git a/script/test b/script/test index 2d6317b9..774ab5a5 100755 --- a/script/test +++ b/script/test @@ -16,6 +16,9 @@ unset BABASHKA_PRELOADS_TEST echo "running tests part 1" lein "do" clean, test "$@" +echo "running flaky tests" +lein "do" clean, test :flaky || true + export BABASHKA_PRELOADS='(defn __bb__foo [] "foo") (defn __bb__bar [] "bar")' export BABASHKA_PRELOADS_TEST=true echo "running tests part 2" diff --git a/script/test.bat b/script/test.bat index d0fe976e..106caed2 100755 --- a/script/test.bat +++ b/script/test.bat @@ -16,7 +16,11 @@ set BABASHKA_POD_TEST= set BABASHKA_SOCKET_REPL_TEST= echo "running tests part 1" -call lein do clean, test :windows || exit /B 1 +call lein do clean, test %* || exit /B 1 + +echo "running flaky tests" +REM there's no "or exit" here because we don't want flaky tests to fail the script +call lein do clean, test :flaky set BABASHKA_PRELOADS=(defn __bb__foo [] "foo") (defn __bb__bar [] "bar") set BABASHKA_PRELOADS_TEST=true