Enable full test exceptions for all platforms

Move LIBSODIUM_FULL_BUILD to the macOS build script, as it is needed for all macOS builds, not only in workflows
This commit is contained in:
Johannes Leupold 2024-08-14 14:26:08 +02:00
parent 086bb1f786
commit e526bb09aa
3 changed files with 10 additions and 12 deletions

View File

@ -18,8 +18,6 @@ jobs:
- run: ./linuxBuild.sh - run: ./linuxBuild.sh
Build-And-Test-Mac: Build-And-Test-Mac:
runs-on: [self-hosted, macOS, ARM64] runs-on: [self-hosted, macOS, ARM64]
env:
LIBSODIUM_FULL_BUILD: 1
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
with: with:

View File

@ -21,7 +21,6 @@ import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTarget
import org.jetbrains.kotlin.gradle.targets.js.testing.KotlinJsTest import org.jetbrains.kotlin.gradle.targets.js.testing.KotlinJsTest
import org.jetbrains.kotlin.gradle.targets.native.tasks.KotlinNativeTest import org.jetbrains.kotlin.gradle.targets.native.tasks.KotlinNativeTest
import org.gradle.api.tasks.testing.logging.TestExceptionFormat import org.gradle.api.tasks.testing.logging.TestExceptionFormat
import org.jetbrains.dokka.Platform
plugins { plugins {
kotlin(PluginsDeps.multiplatform) kotlin(PluginsDeps.multiplatform)
@ -672,15 +671,16 @@ tasks {
} }
if (getHostOsName() == "linux" && getHostArchitecture() == "x86-64") { val jvmTest by getting(Test::class) {
val jvmTest by getting(Test::class) { testLogging {
testLogging { events("PASSED", "FAILED", "SKIPPED")
events("PASSED", "FAILED", "SKIPPED") exceptionFormat = TestExceptionFormat.FULL
exceptionFormat = TestExceptionFormat.FULL showStandardStreams = true
showStandardStreams = true showStackTraces = true
showStackTraces = true
}
} }
}
if (getHostOsName() == "linux" && getHostArchitecture() == "x86-64") {
val linuxX64Test by getting(KotlinNativeTest::class) { val linuxX64Test by getting(KotlinNativeTest::class) {

View File

@ -1,6 +1,6 @@
./configureMacos64.sh ./configureMacos64.sh
cd libsodium cd libsodium
./dist-build/apple-xcframework.sh LIBSODIUM_FULL_BUILD=1 ./dist-build/apple-xcframework.sh
mkdir ../static-ios mkdir ../static-ios
mkdir ../static-ios-simulators mkdir ../static-ios-simulators