Skip to content

Commit 0fdf192

Browse files
committed
make docker commands for: test-swift and test-java
1 parent 25cb67a commit 0fdf192

File tree

2 files changed

+6
-5
lines changed

2 files changed

+6
-5
lines changed

docker/docker-compose.2204.main.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,9 @@ services:
1515
documentation-check:
1616
image: swift-java:22.04-main
1717

18+
test-swift:
19+
image: swift-java:22.04-main
20+
test-java:
21+
image: swift-java:22.04-main
1822
test:
1923
image: swift-java:22.04-main

docker/docker-compose.yaml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,6 @@ services:
1818
working_dir: /swift-java
1919
environment:
2020
JAVA_HOME: /jdk
21-
cap_drop:
22-
- CAP_NET_RAW
23-
- CAP_NET_BIND_SERVICE
2421

2522
soundness:
2623
<<: *common
@@ -36,11 +33,11 @@ services:
3633

3734
test-java:
3835
<<: *common
39-
command: /bin/bash -xcl "uname -a && swift -version && /jdk/bin/java -version && ./gradlew test"
36+
command: /bin/bash -xcl "uname -a && swift -version && /jdk/bin/java -version && make jextract-run && ./gradlew test --debug"
4037

4138
test:
4239
<<: *common
43-
command: /bin/bash -xcl "uname -a && swift -version && /jdk/bin/java -version && swift $${SWIFT_TEST_VERB-test} $${WARN_AS_ERROR_ARG-} $${SANITIZER_ARG-} $${IMPORT_CHECK_ARG-} && ./gradlew test"
40+
command: /bin/bash -xcl "uname -a && swift -version && /jdk/bin/java -version && make jextract-run && swift $${SWIFT_TEST_VERB-test} $${WARN_AS_ERROR_ARG-} $${SANITIZER_ARG-} $${IMPORT_CHECK_ARG-} && ./gradlew test --debug"
4441

4542
# util
4643

0 commit comments

Comments
 (0)