Create fastdebug rather than release builds

galderz · May 4, 2021 · b6d4d30 · b6d4d30
1 parent 559f39c
commit b6d4d30
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 8 deletions.
diff --git a/src/main/java/org/mendrugo/qollider/Jdk.java b/src/main/java/org/mendrugo/qollider/Jdk.java
@@ -182,7 +182,7 @@ static Path javaHome(Path jdk)
             return jdk.resolve(
                 Path.of(
                     "build"
-                    , "graal-server-release"
+                    , "graal-server-fastdebug"
                     , "images"
                     , "graal-builder-jdk"
                 )
@@ -196,13 +196,14 @@ private static Step.Exec configure(Build build, Path home, Path today)
                 , Path.of(build.tree.name())
                 , "bash"
                 , "configure"
-                , "--with-conf-name=graal-server-release"
+                , "--with-conf-name=graal-server-fastdebug"
                 , "--disable-warnings-as-errors"
                 , "--with-jvm-features=graal"
                 , "--with-jvm-variants=server"
                 // Workaround for https://bugs.openjdk.java.net/browse/JDK-8235903 on newer GCC versions
                 , "--with-extra-cflags=-fcommon"
                 , "--enable-aot=no"
+                , "--with-debug-level=fastdebug"
                 , format("--with-boot-jdk=%s", home.resolve(Homes.bootJdk()))
             );
         }

diff --git a/src/qollider.java b/src/qollider.java
@@ -420,7 +420,7 @@ static Path javaHome(Path jdk)
             return jdk.resolve(
                 Path.of(
                     "build"
-                    , "graal-server-release"
+                    , "graal-server-fastdebug"
                     , "images"
                     , "graal-builder-jdk"
                 )
@@ -433,7 +433,7 @@ private static Steps.Exec configure(Build build, Roots roots)
                 Path.of(build.tree.name())
                 , "bash"
                 , "configure"
-                , "--with-conf-name=graal-server-release"
+                , "--with-conf-name=graal-server-fastdebug"
                 , "--disable-warnings-as-errors"
                 , "--with-jvm-features=graal"
                 , "--with-jvm-variants=server"
@@ -2616,7 +2616,7 @@ static Expect javaOpenJdkConfigure()
                 Path.of("jdk11u-dev")
                 , "bash"
                 , "configure"
-                , "--with-conf-name=graal-server-release"
+                , "--with-conf-name=graal-server-fastdebug"
                 , "--disable-warnings-as-errors"
                 , "--with-jvm-features=graal"
                 , "--with-jvm-variants=server"
@@ -2639,7 +2639,7 @@ static Expect javaOpenJdkLink()
         {
             return Expect.of(new Steps.Linking(
                 Path.of("java_home")
-                , Path.of("jdk11u-dev/build/graal-server-release/images/graal-builder-jdk")
+                , Path.of("jdk11u-dev/build/graal-server-fastdebug/images/graal-builder-jdk")
             ));
         }
 

diff --git a/src/test/java/org/mendrugo/qollider/Expect.java b/src/test/java/org/mendrugo/qollider/Expect.java
@@ -152,12 +152,13 @@ public static Expect javaOpenJdkConfigure()
             , Path.of("jdk11u-dev")
             , "bash"
             , "configure"
-            , "--with-conf-name=graal-server-release"
+            , "--with-conf-name=graal-server-fastdebug"
             , "--disable-warnings-as-errors"
             , "--with-jvm-features=graal"
             , "--with-jvm-variants=server"
             , "--with-extra-cflags=-fcommon"
             , "--enable-aot=no"
+            , "--with-debug-level=fastdebug"
             , "--with-boot-jdk=/home/bootjdk_home"
         ));
     }
@@ -176,7 +177,7 @@ public static Expect javaOpenJdkLink()
     {
         return Expect.of(new Step.Linking(
             Path.of("java_home")
-            , Path.of("jdk11u-dev/build/graal-server-release/images/graal-builder-jdk")
+            , Path.of("jdk11u-dev/build/graal-server-fastdebug/images/graal-builder-jdk")
             , Sandbox.today()
         ));
     }