Unit test instead of integration tests

Adding clib classpath to nscplugin in test scope I couldn't find a way to reproduce the compiler crash without using clib
scala-native · Jan 29, 2024 · 1a3dbcc · 1a3dbcc
1 parent c0a1341
commit 1a3dbcc
Show file tree

Hide file tree

Showing 8 changed files with 32 additions and 39 deletions.
diff --git a/nscplugin/src/test/scala-3/scala/scalanative/NIRCompilerTest3.scala b/nscplugin/src/test/scala-3/scala/scalanative/NIRCompilerTest3.scala
@@ -174,6 +174,23 @@ class NIRCompilerTest3 {
         |""".stripMargin
   )
 
+  @Test def opaqueTypes(): Unit = nativeCompilation(
+    """
+    |import scalanative.libc.stdio
+    |import scalanative.unsafe.*
+    |import scalanative.unsigned.*
+    |
+    |opaque type cmark_event_type = CUnsignedInt
+    |object cmark_event_type:
+    |  inline def define(inline a: Long): cmark_event_type = a.toUInt
+    |  val CMARK_EVENT_NONE = define(0)
+    |
+    |@main def hello(): Unit =
+    |  val evtype = cmark_event_type.CMARK_EVENT_NONE
+    |  stdio.printf(c"bla: %s, hello: %d", evtype)
+    |""".stripMargin
+ )
+
   @Test def inlineExternFunction(): Unit = {
     val err = assertThrows(
       classOf[CompilationFailedException],

diff --git a/project/Build.scala b/project/Build.scala
@@ -147,8 +147,8 @@ object Build {
     .mapBinaryVersions(_ => _.dependsOn(testingCompilerInterface % "test"))
     .dependsOnSource(nirJVM)
     .dependsOnSource(utilJVM)
-    .zippedSettings(Seq("testingCompiler", "nativelib")) {
-      case Seq(testingCompiler, nativelib) =>
+    .zippedSettings(Seq("testingCompiler", "nativelib", "clib")) {
+      case Seq(testingCompiler, nativelib, clib) =>
         Test / javaOptions ++= {
           val nscCompilerJar =
             (Compile / Keys.`package`).value.getAbsolutePath()
@@ -159,10 +159,14 @@ object Build {
           val nativelibCp = (nativelib / Compile / fullClasspath).value.files
             .map(_.getAbsolutePath)
             .mkString(pathSeparator)
+          val clibCp = (clib / Compile / fullClasspath).value.files
+            .map(_.getAbsolutePath)
+            .mkString(pathSeparator)
           Seq(
             "-Dscalanative.nscplugin.jar=" + nscCompilerJar,
             "-Dscalanative.testingcompiler.cp=" + testingCompilerCp,
-            "-Dscalanative.nativeruntime.cp=" + nativelibCp
+            "-Dscalanative.nativeruntime.cp=" + nativelibCp,
+            "-Dscalanative.clib.cp=" + clibCp
           )
         }
     }

diff --git a/scripted-tests/scala3/opaque-type/build.sbt b/scripted-tests/scala3/opaque-type/build.sbt
diff --git a/scripted-tests/scala3/opaque-type/project/scala-native.sbt b/scripted-tests/scala3/opaque-type/project/scala-native.sbt
diff --git a/scripted-tests/scala3/opaque-type/src/main/scala/Hello.scala b/scripted-tests/scala3/opaque-type/src/main/scala/Hello.scala
diff --git a/scripted-tests/scala3/opaque-type/test b/scripted-tests/scala3/opaque-type/test
diff --git a/testing-compiler/src/main/scala-2/scalanative/NIRCompiler.scala b/testing-compiler/src/main/scala-2/scalanative/NIRCompiler.scala
@@ -83,7 +83,10 @@ class NIRCompiler(outputDir: Path) extends api.NIRCompiler {
   private case object ScalaNative
       extends CompilerPlugin(
         jarPath = sys props "scalanative.nscplugin.jar",
-        classpath = List(sys props "scalanative.nativeruntime.cp")
+        classpath = List(
+          sys.props("scalanative.nativeruntime.cp"),
+          sys.props("scalanative.clib.cp")
+        )
       )
 
   /** Returns an instance of `Global` configured according to the given options.

diff --git a/testing-compiler/src/main/scala-3/scalanative/NIRCompiler.scala b/testing-compiler/src/main/scala-3/scalanative/NIRCompiler.scala
@@ -39,7 +39,10 @@ class NIRCompiler(outputDir: Path) extends api.NIRCompiler {
   private def compile(sources: Seq[SourceFile]): Seq[Path] = {
     val outPath = outputDir.toAbsolutePath
     val jarPath = sys.props("scalanative.nscplugin.jar")
-    val classpath = List(sys.props("scalanative.nativeruntime.cp"))
+    val classpath = List(
+      sys.props("scalanative.nativeruntime.cp"),
+      sys.props("scalanative.clib.cp")
+    )
       .filterNot(_.isEmpty)
       .mkString("-cp ", File.pathSeparator, "")