Fix native tests

hexagontk · Aug 16, 2023 · 5a43ee1 · 5a43ee1
1 parent d1b507b
commit 5a43ee1
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 17 deletions.
diff --git a/frameworks/Kotlin/hexagon/benchmark_config.json b/frameworks/Kotlin/hexagon/benchmark_config.json
@@ -25,7 +25,7 @@
                 "notes": "http://hexagonkt.com",
                 "versus": "servlet"
             },
-            "jettyloom": {
+            "jetty-native": {
                 "json_url": "/json",
                 "db_url": "/db",
                 "query_url": "/query?queries=",
@@ -44,11 +44,11 @@
                 "webserver": "None",
                 "os": "Linux",
                 "database_os": "Linux",
-                "display_name": "Hexagon Jetty Loom PostgreSQL",
+                "display_name": "Hexagon Jetty Native PostgreSQL",
                 "notes": "http://hexagonkt.com",
                 "versus": "servlet"
             },
-            "jettyloom-pgclient": {
+            "jettyloom": {
                 "json_url": "/json",
                 "db_url": "/db",
                 "query_url": "/query?queries=",
@@ -67,11 +67,11 @@
                 "webserver": "None",
                 "os": "Linux",
                 "database_os": "Linux",
-                "display_name": "Hexagon Jetty Loom PgClient",
+                "display_name": "Hexagon Jetty Loom PostgreSQL",
                 "notes": "http://hexagonkt.com",
                 "versus": "servlet"
             },
-            "nettyepoll": {
+            "jettyloom-pgclient": {
                 "json_url": "/json",
                 "db_url": "/db",
                 "query_url": "/query?queries=",
@@ -86,15 +86,15 @@
                 "framework": "Hexagon",
                 "language": "Kotlin",
                 "orm": "Raw",
-                "platform": "Netty",
+                "platform": "Servlet",
                 "webserver": "None",
                 "os": "Linux",
                 "database_os": "Linux",
-                "display_name": "Hexagon Netty Epoll PostgreSQL",
+                "display_name": "Hexagon Jetty Loom PgClient",
                 "notes": "http://hexagonkt.com",
-                "versus": "netty"
+                "versus": "servlet"
             },
-            "nettyepoll-native": {
+            "nettyepoll": {
                 "json_url": "/json",
                 "db_url": "/db",
                 "query_url": "/query?queries=",
@@ -113,7 +113,7 @@
                 "webserver": "None",
                 "os": "Linux",
                 "database_os": "Linux",
-                "display_name": "Hexagon Netty Epoll Native PgClient",
+                "display_name": "Hexagon Netty Epoll PostgreSQL",
                 "notes": "http://hexagonkt.com",
                 "versus": "netty"
             },

diff --git a/...main/resources/META-INF/native-image/com.hexagonkt.benchmark/core/native-image.properties b/...main/resources/META-INF/native-image/com.hexagonkt.benchmark/core/native-image.properties
@@ -2,6 +2,7 @@ Args= \
   -H:IncludeResources=.*\\.(html|class) \
   --enable-preview \
   --static \
+  --libc=musl \
   --initialize-at-build-time=org.slf4j.jul.JDK14LoggerAdapter \
   --initialize-at-build-time=org.slf4j.jul.JDK14LoggerAdapter$1 \
   --initialize-at-build-time=org.slf4j.LoggerFactory
diff --git a/...agon/hexagon-nettyepoll-native.dockerfile → ...n/hexagon/hexagon-jetty-native.dockerfile b/...agon/hexagon-nettyepoll-native.dockerfile → ...n/hexagon/hexagon-jetty-native.dockerfile
@@ -1,21 +1,21 @@
 #
 # BUILD
 #
-FROM ghcr.io/graalvm/native-image-community:17-ol9 as build
+FROM ghcr.io/graalvm/native-image-community:17-muslib-ol9 as build
 USER root
 WORKDIR /hexagon
 
 ADD . .
 RUN microdnf -y install findutils
 RUN ./gradlew --quiet classes
-RUN ./gradlew --quiet -x test nativeCompile
+RUN ./gradlew --quiet -x test hexagon_jetty_postgresql:nativeCompile
 
 #
 # RUNTIME
 #
 FROM scratch
-ARG PROJECT=hexagon_nettyepoll_postgresql
+ARG PROJECT=hexagon_jetty_postgresql
 
 COPY --from=build /hexagon/$PROJECT/build/native/nativeCompile/$PROJECT /
 
-ENTRYPOINT [ "/hexagon_nettyepoll_postgresql" ]
+ENTRYPOINT [ "/hexagon_jetty_postgresql" ]
diff --git a/frameworks/Kotlin/hexagon/hexagon-nima-native.dockerfile b/frameworks/Kotlin/hexagon/hexagon-nima-native.dockerfile
@@ -1,14 +1,14 @@
 #
 # BUILD
 #
-FROM ghcr.io/graalvm/native-image-community:17-ol9 as build
+FROM ghcr.io/graalvm/native-image-community:20-muslib-ol9 as build
 USER root
 WORKDIR /hexagon
 
 ADD . .
 RUN microdnf -y install findutils
 RUN ./gradlew --quiet classes
-RUN ./gradlew --quiet -x test nativeCompile
+RUN ./gradlew --quiet -x test hexagon_nima_postgresql:nativeCompile
 
 #
 # RUNTIME

diff --git a/...INF/native-image/com.hexagonkt.benchmark/hexagon_jetty_postgresql/native-image.properties b/...INF/native-image/com.hexagonkt.benchmark/hexagon_jetty_postgresql/native-image.properties
@@ -0,0 +1 @@
+Args=-H:IncludeResources=.*\\.css
diff --git a/frameworks/Kotlin/hexagon/hexagon_nettyepoll_postgresql/build.gradle b/frameworks/Kotlin/hexagon/hexagon_nettyepoll_postgresql/build.gradle
@@ -1,5 +1,4 @@
 
-apply(from: "$gradleScripts/native.gradle")
 apply(from: "$gradleScripts/application.gradle")
 
 dependencies {