Skip to content

Commit 262827d

Browse files
kohlschuetterkohlschuetter
committed
common: Update GraalVM config
... and update build-selftest script to include JEP380 tests
1 parent ce43a46 commit 262827d

File tree

6 files changed

+178
-8
lines changed

6 files changed

+178
-8
lines changed

‎junixsocket-common/src/main/resources/META-INF/native-image/com.kohlschutter.junixsocket/junixsocket-common/jni-config.json

+4
Original file line numberDiff line numberDiff line change
@@ -160,6 +160,10 @@
160160
"name":"org.newsclub.net.unix.NoSuchDeviceSocketException",
161161
"methods":[{"name":"<init>","parameterTypes":["java.lang.String"] }]
162162
},
163+
{
164+
"name":"org.newsclub.net.unix.NotConnectedSocketException",
165+
"methods":[{"name":"<init>","parameterTypes":["java.lang.String"] }]
166+
},
163167
{
164168
"name":"org.newsclub.net.unix.AddressUnavailableSocketException",
165169
"methods":[{"name":"<init>","parameterTypes":["java.lang.String"] }]

‎junixsocket-common/src/main/resources/META-INF/native-image/com.kohlschutter.junixsocket/junixsocket-common/reflect-config.json

+14-1
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,20 @@
6565
"name":"java.net.InetSocketAddress"
6666
},
6767
{
68-
"name":"java.net.UnixDomainSocketAddress"
68+
"name":"java.net.UnixDomainSocketAddress",
69+
"methods":[{"name":"of","parameterTypes":["java.nio.file.Path"] }]
70+
},
71+
{
72+
"name":"java.nio.channels.DatagramChannel",
73+
"methods":[{"name":"open","parameterTypes":["java.net.ProtocolFamily"] }]
74+
},
75+
{
76+
"name":"java.nio.channels.ServerSocketChannel",
77+
"methods":[{"name":"open","parameterTypes":["java.net.ProtocolFamily"] }]
78+
},
79+
{
80+
"name":"java.nio.channels.SocketChannel",
81+
"methods":[{"name":"open","parameterTypes":["java.net.ProtocolFamily"] }]
6982
},
7083
{
7184
"name":"org.newsclub.net.unix.AFSYSTEMSocketAddress",

‎junixsocket-native-graalvm/bin/build-selftest

+8-4
Original file line numberDiff line numberDiff line change
@@ -93,13 +93,18 @@ else
9393
echo "[WARNING] mysql-connector-j dependency is missing: $mysqlDep" >&2
9494
fi
9595

96+
selftestArgs=(
97+
-Dselftest.enable-module.junixsocket-common.JavaInet=true
98+
-Dselftest.enable-module.junixsocket-common.JEP380=true
99+
-cp "$jar":"$mysqlDep"
100+
)
101+
96102
echo
97103
echo Running junixsocket-selftest with GraalVM native-image-agent...
98104
(
99105
set -x
100106
java -agentlib:native-image-agent=config-output-dir=${tmpDir}/native-image.{pid} \
101-
-Dselftest.enable-module.junixsocket-common.JavaInet=true \
102-
-cp "$jar":"$mysqlDep" org.newsclub.net.unix.selftest.Selftest >/dev/null
107+
${selftestArgs[@]} org.newsclub.net.unix.selftest.Selftest >/dev/null
103108
)
104109

105110
if [[ $? -ne 0 ]]; then
@@ -120,8 +125,7 @@ echo Running native-image...
120125
(
121126
set -x
122127
native-image -cp "$tmpDir" --initialize-at-build-time=sun.rmi.transport.GC --report-unsupported-elements-at-runtime --no-fallback \
123-
-Dselftest.enable-module.junixsocket-common.JavaInet=true \
124-
-cp "$jar":"$mysqlDep" org.newsclub.net.unix.selftest.Selftest
128+
${selftestArgs[@]} org.newsclub.net.unix.selftest.Selftest
125129
)
126130
if [[ $? -ne 0 ]]; then
127131
echo "Error: Failed to run native-image" >&2

‎junixsocket-native-graalvm/output/META-INF/native-image/com.kohlschutter.junixsocket/junixsocket-native-graalvm/jni-config.json

+4
Original file line numberDiff line numberDiff line change
@@ -137,6 +137,10 @@
137137
"name":"org.newsclub.net.unix.NoSuchDeviceSocketException",
138138
"methods":[{"name":"<init>","parameterTypes":["java.lang.String"] }]
139139
},
140+
{
141+
"name":"org.newsclub.net.unix.NotConnectedSocketException",
142+
"methods":[{"name":"<init>","parameterTypes":["java.lang.String"] }]
143+
},
140144
{
141145
"name":"org.newsclub.net.unix.OperationNotSupportedSocketException",
142146
"methods":[{"name":"<init>","parameterTypes":["java.lang.String"] }]

‎junixsocket-native-graalvm/output/META-INF/native-image/com.kohlschutter.junixsocket/junixsocket-native-graalvm/reflect-config.json

+83-3
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,20 @@
190190
"name":"java.net.InetSocketAddress"
191191
},
192192
{
193-
"name":"java.net.UnixDomainSocketAddress"
193+
"name":"java.net.UnixDomainSocketAddress",
194+
"methods":[{"name":"of","parameterTypes":["java.nio.file.Path"] }]
195+
},
196+
{
197+
"name":"java.nio.channels.DatagramChannel",
198+
"methods":[{"name":"open","parameterTypes":["java.net.ProtocolFamily"] }]
199+
},
200+
{
201+
"name":"java.nio.channels.ServerSocketChannel",
202+
"methods":[{"name":"open","parameterTypes":["java.net.ProtocolFamily"] }]
203+
},
204+
{
205+
"name":"java.nio.channels.SocketChannel",
206+
"methods":[{"name":"open","parameterTypes":["java.net.ProtocolFamily"] }]
194207
},
195208
{
196209
"name":"java.nio.channels.spi.AbstractSelectableChannel"
@@ -316,6 +329,10 @@
316329
"name":"org.junit.jupiter.api.Test",
317330
"queryAllPublicMethods":true
318331
},
332+
{
333+
"name":"org.junit.jupiter.api.TestInstance",
334+
"queryAllPublicMethods":true
335+
},
319336
{
320337
"name":"org.junit.jupiter.api.TestMethodOrder",
321338
"queryAllPublicMethods":true
@@ -367,6 +384,16 @@
367384
"name":"org.junit.jupiter.params.provider.EnumSource",
368385
"queryAllPublicMethods":true
369386
},
387+
{
388+
"name":"org.junit.jupiter.params.provider.MethodArgumentsProvider",
389+
"queryAllDeclaredMethods":true,
390+
"queryAllPublicMethods":true,
391+
"methods":[{"name":"<init>","parameterTypes":[] }]
392+
},
393+
{
394+
"name":"org.junit.jupiter.params.provider.MethodSource",
395+
"queryAllPublicMethods":true
396+
},
370397
{
371398
"name":"org.junit.jupiter.params.support.AnnotationConsumer",
372399
"queryAllPublicMethods":true
@@ -573,6 +600,14 @@
573600
"queryAllDeclaredConstructors":true,
574601
"methods":[{"name":"<init>","parameterTypes":[] }, {"name":"testFromToBytes","parameterTypes":[] }, {"name":"testHostnameString","parameterTypes":[] }, {"name":"testHostnameStringEndsWithJunixSocket","parameterTypes":[] }, {"name":"testIsLoopbackAddress","parameterTypes":[] }]
575602
},
603+
{
604+
"name":"org.newsclub.net.unix.InterruptIssue158Test",
605+
"allDeclaredFields":true,
606+
"allDeclaredClasses":true,
607+
"queryAllDeclaredMethods":true,
608+
"queryAllPublicMethods":true,
609+
"methods":[{"name":"afterEach","parameterTypes":[] }, {"name":"beforeEach","parameterTypes":["org.junit.jupiter.api.TestInfo"] }, {"name":"clientProvider","parameterTypes":[] }, {"name":"serverProvider","parameterTypes":[] }, {"name":"testClientInterruption","parameterTypes":["boolean","org.newsclub.net.unix.InterruptIssue158Test$IOSupplier","org.newsclub.net.unix.InterruptIssue158Test$IOConsumer","java.lang.Class","java.util.function.Predicate"] }, {"name":"testClientInterruptionWithDelay","parameterTypes":["boolean","org.newsclub.net.unix.InterruptIssue158Test$IOSupplier","org.newsclub.net.unix.InterruptIssue158Test$IOConsumer","java.lang.Class","java.util.function.Predicate"] }, {"name":"testServerInterruption","parameterTypes":["org.newsclub.net.unix.InterruptIssue158Test$IOSupplier","org.newsclub.net.unix.InterruptIssue158Test$IOConsumer","java.lang.Class","java.util.function.Predicate"] }, {"name":"testServerInterruptionWithDelay","parameterTypes":["org.newsclub.net.unix.InterruptIssue158Test$IOSupplier","org.newsclub.net.unix.InterruptIssue158Test$IOConsumer","java.lang.Class","java.util.function.Predicate"] }]
610+
},
576611
{
577612
"name":"org.newsclub.net.unix.InterruptTest",
578613
"allDeclaredFields":true,
@@ -656,7 +691,7 @@
656691
"allDeclaredClasses":true,
657692
"queryAllDeclaredMethods":true,
658693
"queryAllPublicMethods":true,
659-
"methods":[{"name":"testByteBufferWithPositionOffset","parameterTypes":[] }, {"name":"testDoubleBindAddressNotReusable","parameterTypes":[] }, {"name":"testDoubleBindAddressReusable","parameterTypes":[] }, {"name":"testNonBlockingConnect","parameterTypes":[] }]
694+
"methods":[{"name":"testAcceptNotBoundYet","parameterTypes":[] }, {"name":"testByteBufferWithPositionOffset","parameterTypes":[] }, {"name":"testDoubleBindAddressNotReusable","parameterTypes":[] }, {"name":"testDoubleBindAddressReusable","parameterTypes":[] }, {"name":"testNonBlockingConnect","parameterTypes":[] }, {"name":"testReadNotConnectedYet","parameterTypes":[] }, {"name":"testWriteNotConnectedYet","parameterTypes":[] }]
660695
},
661696
{
662697
"name":"org.newsclub.net.unix.SocketClosedException"
@@ -817,6 +852,15 @@
817852
"queryAllDeclaredConstructors":true,
818853
"methods":[{"name":"<init>","parameterTypes":[] }, {"name":"testAncillaryReceiveBufferTooSmall","parameterTypes":[] }, {"name":"testBadFileDescriptor","parameterTypes":[] }, {"name":"testDatagramSocket","parameterTypes":[] }, {"name":"testEmptyFileDescriptorArray","parameterTypes":[] }, {"name":"testFileInputStream","parameterTypes":[] }, {"name":"testFileInputStreamPartiallyConsumed","parameterTypes":[] }, {"name":"testNoAncillaryReceiveBuffer","parameterTypes":[] }, {"name":"testNullFileDescriptorArray","parameterTypes":[] }, {"name":"testSendRecvFileDescriptors","parameterTypes":[] }]
819854
},
855+
{
856+
"name":"org.newsclub.net.unix.domain.InterruptIssue158Test",
857+
"allDeclaredFields":true,
858+
"allDeclaredClasses":true,
859+
"queryAllDeclaredMethods":true,
860+
"queryAllPublicMethods":true,
861+
"queryAllDeclaredConstructors":true,
862+
"methods":[{"name":"<init>","parameterTypes":[] }]
863+
},
820864
{
821865
"name":"org.newsclub.net.unix.domain.InterruptTest",
822866
"allDeclaredFields":true,
@@ -905,7 +949,7 @@
905949
"queryAllDeclaredMethods":true,
906950
"queryAllPublicMethods":true,
907951
"queryAllDeclaredConstructors":true,
908-
"methods":[{"name":"<init>","parameterTypes":[] }]
952+
"methods":[{"name":"<init>","parameterTypes":[] }, {"name":"testUnixDomainProtocolFamily","parameterTypes":[] }]
909953
},
910954
{
911955
"name":"org.newsclub.net.unix.domain.SocketFactoryTest",
@@ -981,6 +1025,15 @@
9811025
{
9821026
"name":"org.newsclub.net.unix.generic.AFGenericSelectorProvider"
9831027
},
1028+
{
1029+
"name":"org.newsclub.net.unix.java.InterruptIssue158Test",
1030+
"allDeclaredFields":true,
1031+
"allDeclaredClasses":true,
1032+
"queryAllDeclaredMethods":true,
1033+
"queryAllPublicMethods":true,
1034+
"queryAllDeclaredConstructors":true,
1035+
"methods":[{"name":"<init>","parameterTypes":[] }]
1036+
},
9841037
{
9851038
"name":"org.newsclub.net.unix.java.InterruptTest",
9861039
"allDeclaredFields":true,
@@ -1007,6 +1060,15 @@
10071060
"queryAllDeclaredConstructors":true,
10081061
"methods":[{"name":"<init>","parameterTypes":[] }]
10091062
},
1063+
{
1064+
"name":"org.newsclub.net.unix.java.SocketChannelTest",
1065+
"allDeclaredFields":true,
1066+
"allDeclaredClasses":true,
1067+
"queryAllDeclaredMethods":true,
1068+
"queryAllPublicMethods":true,
1069+
"queryAllDeclaredConstructors":true,
1070+
"methods":[{"name":"<init>","parameterTypes":[] }]
1071+
},
10101072
{
10111073
"name":"org.newsclub.net.unix.java.ThroughputTest",
10121074
"allDeclaredFields":true,
@@ -1016,6 +1078,24 @@
10161078
"queryAllDeclaredConstructors":true,
10171079
"methods":[{"name":"<init>","parameterTypes":[] }]
10181080
},
1081+
{
1082+
"name":"org.newsclub.net.unix.jep380.InterruptIssue158Test",
1083+
"allDeclaredFields":true,
1084+
"allDeclaredClasses":true,
1085+
"queryAllDeclaredMethods":true,
1086+
"queryAllPublicMethods":true,
1087+
"queryAllDeclaredConstructors":true,
1088+
"methods":[{"name":"<init>","parameterTypes":[] }]
1089+
},
1090+
{
1091+
"name":"org.newsclub.net.unix.jep380.SocketChannelTest",
1092+
"allDeclaredFields":true,
1093+
"allDeclaredClasses":true,
1094+
"queryAllDeclaredMethods":true,
1095+
"queryAllPublicMethods":true,
1096+
"queryAllDeclaredConstructors":true,
1097+
"methods":[{"name":"<init>","parameterTypes":[] }]
1098+
},
10191099
{
10201100
"name":"org.newsclub.net.unix.rmi.AFRMIService",
10211101
"queryAllPublicMethods":true

‎junixsocket-selftest/src/main/resources/META-INF/native-image/com.kohlschutter.junixsocket/junixsocket-selftest/reflect-config.json

+65
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,10 @@
6060
"name":"org.junit.jupiter.api.Test",
6161
"queryAllPublicMethods":true
6262
},
63+
{
64+
"name":"org.junit.jupiter.api.TestInstance",
65+
"queryAllPublicMethods":true
66+
},
6367
{
6468
"name":"org.junit.jupiter.api.TestMethodOrder",
6569
"queryAllPublicMethods":true
@@ -530,6 +534,15 @@
530534
"allPublicMethods":true,
531535
"allDeclaredConstructors":true
532536
},
537+
{
538+
"name":"org.newsclub.net.unix.java.SocketChannelTest",
539+
"allDeclaredMethods":true,
540+
"allDeclaredFields":true,
541+
"allDeclaredClasses":true,
542+
"queryAllDeclaredMethods":true,
543+
"allPublicMethods":true,
544+
"allDeclaredConstructors":true
545+
},
533546
{
534547
"name":"org.newsclub.net.unix.java.ThroughputTest",
535548
"allDeclaredFields":true,
@@ -538,6 +551,15 @@
538551
"allPublicMethods":true,
539552
"allDeclaredConstructors":true
540553
},
554+
{
555+
"name":"org.newsclub.net.unix.jep380.SocketChannelTest",
556+
"allDeclaredMethods":true,
557+
"allDeclaredFields":true,
558+
"allDeclaredClasses":true,
559+
"queryAllDeclaredMethods":true,
560+
"allPublicMethods":true,
561+
"allDeclaredConstructors":true
562+
},
541563
{
542564
"name":"org.newsclub.net.unix.java.JavaInetStackCondition",
543565
"methods":[{"name":"<init>","parameterTypes":[] }]
@@ -1039,6 +1061,16 @@
10391061
"name":"org.junit.jupiter.params.provider.EnumSource",
10401062
"queryAllPublicMethods":true
10411063
},
1064+
{
1065+
"name":"org.junit.jupiter.params.provider.MethodArgumentsProvider",
1066+
"queryAllDeclaredMethods":true,
1067+
"queryAllPublicMethods":true,
1068+
"methods":[{"name":"<init>","parameterTypes":[] }]
1069+
},
1070+
{
1071+
"name":"org.junit.jupiter.params.provider.MethodSource",
1072+
"queryAllPublicMethods":true
1073+
},
10421074
{
10431075
"name":"org.junit.jupiter.params.support.AnnotationConsumer",
10441076
"queryAllPublicMethods":true
@@ -1071,6 +1103,39 @@
10711103
"queryAllPublicMethods":true,
10721104
"queryAllDeclaredConstructors":true
10731105
},
1106+
{
1107+
"name":"org.newsclub.net.unix.InterruptIssue158Test",
1108+
"allDeclaredConstructors" : true,
1109+
"allPublicConstructors" : true,
1110+
"allDeclaredMethods":true,
1111+
"allDeclaredFields":true,
1112+
"allDeclaredClasses":true,
1113+
"queryAllDeclaredMethods":true,
1114+
"queryAllPublicMethods":true,
1115+
"queryAllDeclaredConstructors":true
1116+
},
1117+
{
1118+
"name":"org.newsclub.net.unix.domain.InterruptIssue158Test",
1119+
"allDeclaredConstructors" : true,
1120+
"allPublicConstructors" : true,
1121+
"allDeclaredMethods":true,
1122+
"allDeclaredFields":true,
1123+
"allDeclaredClasses":true,
1124+
"queryAllDeclaredMethods":true,
1125+
"queryAllPublicMethods":true,
1126+
"queryAllDeclaredConstructors":true
1127+
},
1128+
{
1129+
"name":"org.newsclub.net.unix.jep380.InterruptIssue158Test",
1130+
"allDeclaredConstructors" : true,
1131+
"allPublicConstructors" : true,
1132+
"allDeclaredMethods":true,
1133+
"allDeclaredFields":true,
1134+
"allDeclaredClasses":true,
1135+
"queryAllDeclaredMethods":true,
1136+
"queryAllPublicMethods":true,
1137+
"queryAllDeclaredConstructors":true
1138+
},
10741139
{
10751140
"name":"org.newsclub.net.unix.rmi.NaiveFileInputStreamRemote",
10761141
"allDeclaredConstructors" : true,

0 commit comments

Comments
 (0)