[Git][clojure-team/ring-clojure][experimental] 2 commits: d/rules: run ring-jetty-adapter tests
Jérôme Charaoui (@lavamind)
gitlab at salsa.debian.org
Sat Aug 8 00:11:52 BST 2026
Jérôme Charaoui pushed to branch experimental at Debian Clojure Maintainers / ring-clojure
Commits:
d141ae61 by Jérôme Charaoui at 2026-08-07T18:19:46-04:00
d/rules: run ring-jetty-adapter tests
- - - - -
41c72087 by Jérôme Charaoui at 2026-08-07T18:19:46-04:00
refresh autopkgtests
- - - - -
12 changed files:
- debian/rules
- debian/tests/build-core
- + debian/tests/build-jakarta-servlet
- − debian/tests/build-jetty
- + debian/tests/build-jetty-adapter
- debian/tests/build-servlet
- debian/tests/control
- debian/tests/unittests-core
- + debian/tests/unittests-jakarta-servlet
- − debian/tests/unittests-jetty
- + debian/tests/unittests-jetty-adapter
- debian/tests/unittests-servlet
Changes:
=====================================
debian/rules
=====================================
@@ -7,7 +7,6 @@ export LEIN_HOME=$(CURDIR)/.lein
export LEIN_OFFLINE=true
SUB_PROJECTS=org.ring-clojure/ring-core-protocols org.ring-clojure/ring-websocket-protocols ring/ring-core ring/ring-servlet org.ring-clojure/ring-jakarta-servlet ring/ring-jetty-adapter
-SUB_PROJECTS_tests=ring-core-protocols ring-core ring-servlet ring-jakarta-servlet
ns = $(firstword $(subst /, ,$1))
project = $(word 2,$(subst /, ,$1))
@@ -38,14 +37,17 @@ override_dh_auto_build:
override_dh_auto_test:
ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
- $(foreach sub,$(SUB_PROJECTS_tests), \
+ $(foreach sub,$(SUB_PROJECTS), \
set -e; \
- echo "---> Testing $(sub)"; \
- cd $(CURDIR)/$(sub); \
- if ! lein test; then \
- cat /tmp/clojure-*.edn; \
- exit 1; \
- fi ; \
+ export PROJECT="$(call project,$(sub))"; \
+ cd $(CURDIR)/$${PROJECT}; \
+ if [ -d test ]; then \
+ echo "---> Testing $(sub)"; \
+ if ! lein test; then \
+ cat /tmp/clojure-*.edn; \
+ exit 1; \
+ fi; \
+ fi; \
)
endif
=====================================
debian/tests/build-core
=====================================
@@ -1,5 +1,5 @@
#!/bin/sh
-CLASSPATH=/usr/share/java/clojure.jar:/usr/share/java/ring-codec.jar:/usr/share/java/commons-io.jar:/usr/share/java/commons-fileupload.jar:/usr/share/java/clj-time.jar:/usr/share/java/crypto-random.jar:/usr/share/java/crypto-equality.jar:/usr/share/java/ring-core.jar
+java -jar /usr/share/java/ring-core.jar -e '(use '"'"'ring.middleware.resource)'
-clojure -cp $CLASSPATH -e '(use '"'"'ring.core.protocols)'
+java -jar /usr/share/java/ring-core-protocols.jar -e '(use '"'"'ring.core.protocols)'
=====================================
debian/tests/build-jakarta-servlet
=====================================
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+java -jar /usr/share/java/ring-jakarta-servlet.jar -e '(use '"'"'ring.util.jakarta.servlet)'
=====================================
debian/tests/build-jetty deleted
=====================================
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-CLASSPATH=/usr/share/java/clojure.jar:/usr/share/java/ring-core.jar:/usr/share/java/ring-servlet.jar:/usr/share/java/jetty9-server.jar:/usr/share/java/jetty9-util.jar:/usr/share/java/jetty9-http.jar:/usr/share/java/jetty9-io.jar:/usr/share/java/clj-http.jar:/usr/share/java/ring-jetty-adapter.jar
-
-clojure -cp $CLASSPATH -e '(use '"'"'ring.adapter.jetty)'
=====================================
debian/tests/build-jetty-adapter
=====================================
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+java -jar /usr/share/java/ring-jetty-adapter.jar -e '(use '"'"'ring.adapter.jetty)'
=====================================
debian/tests/build-servlet
=====================================
@@ -1,5 +1,3 @@
#!/bin/sh
-CLASSPATH=/usr/share/java/clojure.jar:/usr/share/java/ring-core.jar:/usr/share/java/servlet-api.jar:/usr/share/java/ring-servlet.jar
-
-clojure -cp $CLASSPATH -e '(use '"'"'ring.util.servlet)'
+java -jar /usr/share/java/ring-servlet.jar -e '(use '"'"'ring.util.servlet)'
=====================================
debian/tests/control
=====================================
@@ -1,47 +1,64 @@
Tests:
build-core,
Depends:
- clojure,
- @,
+ default-jdk-headless,
+ libring-core-clojure,
Restrictions:
superficial,
Tests:
- build-servlet,
+ build-jakarta-servlet,
Depends:
- clojure,
- @,
+ default-jdk-headless,
+ libring-jakarta-servlet-clojure,
Restrictions:
superficial,
Tests:
- build-jetty,
+ build-jetty-adapter,
+Depends:
+ default-jdk-headless,
+ libring-jetty-adapter-clojure,
+Restrictions:
+ superficial,
+
+Tests:
+ build-servlet,
Depends:
- clojure,
- @,
+ default-jdk-headless,
+ libring-servlet-clojure,
Restrictions:
- allow-stderr,
superficial,
Tests:
unittests-core,
Depends:
- clojure,
- libbultitude-clojure,
- @,
+ default-jdk-headless,
+ libcognitect-test-runner-clojure,
+ libring-core-clojure,
+ libclj-time-clojure,
Tests:
- unittests-servlet,
+ unittests-jakarta-servlet,
Depends:
- clojure,
- libbultitude-clojure,
- @,
+ default-jdk-headless,
+ libcognitect-test-runner-clojure,
+ libring-jakarta-servlet-clojure,
Tests:
- unittests-jetty,
+ unittests-jetty-adapter,
Depends:
- clojure,
- libbultitude-clojure,
- @,
-Restrictions:
- allow-stderr,
+ default-jdk-headless,
+ libclj-http-clojure,
+ libcognitect-test-runner-clojure,
+ libjetty12-java,
+ libjetty12-extra-java,
+ libring-jetty-adapter-clojure,
+ libslf4j2-java,
+
+Tests:
+ unittests-servlet,
+Depends:
+ default-jdk-headless,
+ libcognitect-test-runner-clojure,
+ libring-servlet-clojure,
=====================================
debian/tests/unittests-core
=====================================
@@ -1,15 +1,19 @@
#!/bin/sh
set -efu
-CLASSPATH=/usr/share/java/clojure.jar:/usr/share/java/bultitude.jar:/usr/share/java/ring-codec.jar:/usr/share/java/commons-io.jar:/usr/share/java/commons-fileupload.jar:/usr/share/java/clj-time.jar:/usr/share/java/crypto-random.jar:/usr/share/java/crypto-equality.jar:/usr/share/java/servlet-api.jar:/usr/share/java/ring-core.jar:test
-
-cp -a ring-core/test "$AUTOPKGTEST_TMP"
-cd "$AUTOPKGTEST_TMP"
-
-clojure \
- -cp $CLASSPATH \
- -e "(require '[clojure.test])" \
- -e "(require '[bultitude.core :as b])" \
- -e '(def all-tests (b/namespaces-on-classpath :classpath "test"))' \
- -e "(map #(require %) all-tests)" \
- -e '(System/exit (if (clojure.test/successful? (clojure.test/run-all-tests #"ring\.[^\.]+\.test\S+")) 0 1))'
+mkdir -p "$AUTOPKGTEST_TMP/ring-core"
+cp -a ring-core/test "$AUTOPKGTEST_TMP/ring-core/test"
+mkdir -p "$AUTOPKGTEST_TMP/ring-core-protocols"
+cp -a ring-core-protocols/test "$AUTOPKGTEST_TMP/ring-core-protocols/test"
+
+cd "$AUTOPKGTEST_TMP/ring-core"
+
+export CLASSPATH=/usr/share/java/ring-core.jar:/usr/share/java/clj-time.jar:/usr/share/java/test-runner.jar:test
+java clojure.main -m cognitect.test-runner cognitect.test-runner.api/test -r 'ring\.[^\.]+\.test\.\S+$'
+
+cd "$AUTOPKGTEST_TMP/ring-core-protocols"
+
+export CLASSPATH=/usr/share/java/ring-core-protocols.jar:/usr/share/java/test-runner.jar:test
+java clojure.main -m cognitect.test-runner cognitect.test-runner.api/test -r 'ring\.[^\.]+\.test\.\S+$'
+
+# no testsuite in ring-websocket-protocols
=====================================
debian/tests/unittests-jakarta-servlet
=====================================
@@ -0,0 +1,9 @@
+#!/bin/sh
+set -efu
+
+cp -a ring-jakarta-servlet/test "$AUTOPKGTEST_TMP"
+
+cd "$AUTOPKGTEST_TMP"
+
+export CLASSPATH=/usr/share/java/ring-jakarta-servlet.jar:/usr/share/java/test-runner.jar:test
+java clojure.main -m cognitect.test-runner cognitect.test-runner.api/test -n 'ring.util.jakarta.test.servlet'
=====================================
debian/tests/unittests-jetty deleted
=====================================
@@ -1,15 +0,0 @@
-#!/bin/sh
-set -efu
-
-CLASSPATH=/usr/share/java/clojure.jar:/usr/share/java/bultitude.jar:/usr/share/java/ring-core.jar:/usr/share/java/ring-servlet.jar:/usr/share/java/jetty9-server.jar:/usr/share/java/jetty9-util.jar:/usr/share/java/jetty9-http.jar:/usr/share/java/jetty9-io.jar:/usr/share/java/clj-http.jar:/usr/share/java/ring-jetty-adapter.jar:test
-
-cp -a ring-jetty-adapter/test "$AUTOPKGTEST_TMP"
-cd "$AUTOPKGTEST_TMP"
-
-clojure \
- -cp $CLASSPATH \
- -e "(require '[clojure.test])" \
- -e "(require '[bultitude.core :as b])" \
- -e '(def all-tests (b/namespaces-on-classpath :classpath "test"))' \
- -e "(map #(require %) all-tests)" \
- -e '(System/exit (if (clojure.test/successful? (clojure.test/run-all-tests #"ring\.[^\.]+\.test\S+")) 0 1))'
=====================================
debian/tests/unittests-jetty-adapter
=====================================
@@ -0,0 +1,9 @@
+#!/bin/sh
+set -efu
+
+cp -a ring-jetty-adapter/test "$AUTOPKGTEST_TMP"
+
+cd "$AUTOPKGTEST_TMP"
+
+export CLASSPATH=/usr/share/java/ring-jetty-adapter.jar:/usr/share/java/clj-http.jar:/usr/share/java/test-runner.jar:test
+java clojure.main -m cognitect.test-runner cognitect.test-runner.api/test -n 'ring.adapter.test.jetty'
=====================================
debian/tests/unittests-servlet
=====================================
@@ -1,15 +1,8 @@
#!/bin/sh
set -efu
-CLASSPATH=/usr/share/java/clojure.jar:/usr/share/java/bultitude.jar:/usr/share/java/ring-core.jar:/usr/share/java/servlet-api.jar:/usr/share/java/ring-servlet.jar:test
-
cp -a ring-servlet/test "$AUTOPKGTEST_TMP"
cd "$AUTOPKGTEST_TMP"
-clojure \
- -cp $CLASSPATH \
- -e "(require '[clojure.test])" \
- -e "(require '[bultitude.core :as b])" \
- -e '(def all-tests (b/namespaces-on-classpath :classpath "test"))' \
- -e "(map #(require %) all-tests)" \
- -e '(System/exit (if (clojure.test/successful? (clojure.test/run-all-tests #"ring\.[^\.]+\.test\S+")) 0 1))'
+export CLASSPATH=/usr/share/java/ring-servlet.jar:/usr/share/java/test-runner.jar:test
+java clojure.main -m cognitect.test-runner cognitect.test-runner.api/test -n 'ring.util.test.servlet'
View it on GitLab: https://salsa.debian.org/clojure-team/ring-clojure/-/compare/c854b3823cee132bc50d26b927c0c6cfe5bf0f97...41c720873c93168939aaceace9c16c4b9e19672f
--
View it on GitLab: https://salsa.debian.org/clojure-team/ring-clojure/-/compare/c854b3823cee132bc50d26b927c0c6cfe5bf0f97...41c720873c93168939aaceace9c16c4b9e19672f
You're receiving this email because of your account on salsa.debian.org. Manage all notifications: https://salsa.debian.org/-/profile/notifications | Help: https://salsa.debian.org/help
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20260807/508a68f5/attachment.htm>
More information about the pkg-java-commits
mailing list