Using testnative when running in the CI

enso-org · Jan 23, 2025 · 34300d0 · 34300d0
1 parent ec80c80
commit 34300d0
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 9 deletions.
diff --git a/build_tools/build/src/engine.rs b/build_tools/build/src/engine.rs
@@ -180,8 +180,11 @@ pub enum EngineLauncher {
     /// The binary inside the engine distribution will be built as an optimized native image
     Native,
     /// The binary inside the engine distribution will be built as native image with assertions
+    /// enabled but no debug information
+    TestNative,
+    /// The binary inside the engine distribution will be built as native image with assertions
     /// enabled and debug information
-    DebugNative,
+    TestDebugNative,
     /// The binary inside the engine distribution will be a shell script
     #[default]
     Shell,
@@ -191,11 +194,20 @@ impl FromStr for EngineLauncher {
     type Err = anyhow::Error;
 
     fn from_str(s: &str) -> Result<Self> {
-        match s {
-            "native" => Ok(Self::Native),
-            "debugnative" => Ok(Self::DebugNative),
-            "shell" => Ok(Self::Shell),
-            _ => bail!("Invalid Engine Launcher type: {}", s),
+        if s == "shell" {
+            Ok(Self::Shell)
+        } else if s.contains("native") {
+            if s.contains("test") {
+                if s.contains("debug") {
+                    Ok(Self::TestDebugNative)
+                } else {
+                    Ok(Self::TestNative)
+                }
+            } else {
+                Ok(Self::Native)
+            }
+        } else {
+            bail!("Invalid Engine Launcher type: {}", s)
         }
     }
 }
@@ -204,7 +216,8 @@ impl From<EngineLauncher> for String {
     fn from(value: EngineLauncher) -> Self {
         match value {
             EngineLauncher::Native => "native".to_string(),
-            EngineLauncher::DebugNative => "debugnative".to_string(),
+            EngineLauncher::TestNative => "testnative".to_string(),
+            EngineLauncher::TestDebugNative => "testdebugnative".to_string(),
             EngineLauncher::Shell => "shell".to_string(),
         }
     }
@@ -214,7 +227,8 @@ impl Display for EngineLauncher {
     fn fmt(&self, f: &mut Formatter) -> std::fmt::Result {
         match *self {
             EngineLauncher::Native => write!(f, "native"),
-            EngineLauncher::DebugNative => write!(f, "debugnative"),
+            EngineLauncher::TestNative => write!(f, "testnative"),
+            EngineLauncher::TestDebugNative => write!(f, "testdebugnative"),
             EngineLauncher::Shell => write!(f, "shell"),
         }
     }

diff --git a/build_tools/build/src/engine/context.rs b/build_tools/build/src/engine/context.rs
@@ -200,7 +200,7 @@ impl RunContext {
             sbt.call_arg("syntax-rust-definition/Runtime/managedClasspath").await?;
         }
         if self.config.build_native_runner {
-            env::ENSO_LAUNCHER.set(&engine::EngineLauncher::DebugNative)?;
+            env::ENSO_LAUNCHER.set(&engine::EngineLauncher::TestNative)?;
         }
 
         // TODO: Once the native image is production ready, we should switch to