From 9bbe812c3ccc5b26100e4fbd30b851c609e8a3a7 Mon Sep 17 00:00:00 2001 From: Felix Morgner Date: Fri, 4 Sep 2026 22:15:01 +0200 Subject: build: use Release config for release builds --- CMakePresets.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'CMakePresets.json') diff --git a/CMakePresets.json b/CMakePresets.json index b26d9576..2dc18a09 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -7,7 +7,7 @@ "binaryDir": "${sourceDir}/build/${presetName}", "generator": "Ninja Multi-Config", "cacheVariables": { - "CMAKE_CONFIGURATION_TYPES": "Debug;MinSizeRel", + "CMAKE_CONFIGURATION_TYPES": "Debug;Release", "CMAKE_EXPORT_COMPILE_COMMANDS": true, "CMAKE_VERIFY_INTERFACE_HEADER_SETS": true } @@ -58,7 +58,7 @@ "displayName": "x86-64 kernel image (Release)", "description": "Bootable release image for x86-64 systems", "configurePreset": "x86_64", - "configuration": "MinSizeRel" + "configuration": "Release" }, { "name": "bht-dbg", @@ -72,7 +72,7 @@ "displayName": "Build-host tests (Release)", "description": "Unit and integration tests", "configurePreset": "bht", - "configuration": "MinSizeRel" + "configuration": "Release" }, { "name": "bht-stress-dbg", @@ -108,7 +108,7 @@ "displayName": "Build-host tests (Release)", "description": "Unit and integration tests", "configurePreset": "bht", - "configuration": "MinSizeRel", + "configuration": "Release", "output": { "outputOnFailure": true }, @@ -134,7 +134,7 @@ "displayName": "Build-host stress tests (Release)", "description": "Stress tests", "configurePreset": "bht-stress", - "configuration": "MinSizeRel", + "configuration": "Release", "output": { "outputOnFailure": true }, -- cgit v1.2.3 From ebed4746799df1b733a554d0dc174307029d0196 Mon Sep 17 00:00:00 2001 From: Felix Morgner Date: Wed, 9 Sep 2026 12:39:06 +0200 Subject: build: clean up presets --- CMakePresets.json | 126 +++++++++++++++++++++++++++++++++++++++++------------- 1 file changed, 97 insertions(+), 29 deletions(-) (limited to 'CMakePresets.json') diff --git a/CMakePresets.json b/CMakePresets.json index 2dc18a09..1db75229 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -24,7 +24,7 @@ }, { "name": "bht", - "displayName": "Build-host testing", + "displayName": "Build-host tests", "inherits": "base", "description": "Unit and integration tests w/ UB Sanitizer, Memory Sanitizer, and Leak Sanitizer", "cacheVariables": { @@ -35,7 +35,7 @@ }, { "name": "bht-stress", - "displayName": "Build-host stress testing", + "displayName": "Build-host stress tests", "inherits": "bht", "description": "Stress tests w/ Thread Sanitizer", "cacheVariables": { @@ -48,54 +48,59 @@ "buildPresets": [ { "name": "x86_64-dbg", - "displayName": "x86-64 kernel image (Debug)", + "displayName": "Debug Image", "description": "Bootable debug image for x86-64 systems", "configurePreset": "x86_64", "configuration": "Debug" }, { "name": "x86_64-rel", - "displayName": "x86-64 kernel image (Release)", + "displayName": "Release Image", "description": "Bootable release image for x86-64 systems", "configurePreset": "x86_64", "configuration": "Release" }, { "name": "bht-dbg", - "displayName": "Build-host tests (Debug)", + "displayName": "Debug", "description": "Unit and integration tests", "configurePreset": "bht", "configuration": "Debug" }, { "name": "bht-rel", - "displayName": "Build-host tests (Release)", + "displayName": "Release", "description": "Unit and integration tests", "configurePreset": "bht", "configuration": "Release" }, { "name": "bht-stress-dbg", - "displayName": "Build-host stress tests (Debug)", + "displayName": "Debug", "description": "Stress tests", "configurePreset": "bht-stress", "configuration": "Debug" }, { "name": "bht-stress-rel", - "displayName": "Build-host stress tests (Release)", + "displayName": "Release", "description": "Stress tests", "configurePreset": "bht-stress", - "configuration": "Debug" + "configuration": "Release" } ], "testPresets": [ { "name": "bht-dbg", - "displayName": "Build-host tests (Debug)", + "displayName": "All Tests", "description": "Unit and integration tests", "configurePreset": "bht", "configuration": "Debug", + "condition": { + "type": "equals", + "lhs": "${presetName}", + "rhs": "bht-dbg" + }, "output": { "outputOnFailure": true }, @@ -105,10 +110,15 @@ }, { "name": "bht-rel", - "displayName": "Build-host tests (Release)", + "displayName": "All Tests", "description": "Unit and integration tests", "configurePreset": "bht", "configuration": "Release", + "condition": { + "type": "equals", + "lhs": "${presetName}", + "rhs": "bht-rel" + }, "output": { "outputOnFailure": true }, @@ -118,10 +128,15 @@ }, { "name": "bht-stress-dbg", - "displayName": "Build-host stress tests (Debug)", + "displayName": "All Tests", "description": "Stress tests", "configurePreset": "bht-stress", "configuration": "Debug", + "condition": { + "type": "equals", + "lhs": "${presetName}", + "rhs": "bht-stress-dbg" + }, "output": { "outputOnFailure": true }, @@ -131,10 +146,15 @@ }, { "name": "bht-stress-rel", - "displayName": "Build-host stress tests (Release)", + "displayName": "All Tests", "description": "Stress tests", "configurePreset": "bht-stress", "configuration": "Release", + "condition": { + "type": "equals", + "lhs": "${presetName}", + "rhs": "bht-stress-rel" + }, "output": { "outputOnFailure": true }, @@ -149,8 +169,14 @@ "displayName": "x86-64 kernel (Debug)", "description": "TeachOS on x86-64", "steps": [ - { "type": "configure", "name": "x86_64" }, - { "type": "build", "name": "x86_64-dbg" } + { + "type": "configure", + "name": "x86_64" + }, + { + "type": "build", + "name": "x86_64-dbg" + } ] }, { @@ -158,8 +184,14 @@ "displayName": "x86-64 kernel (Release)", "description": "TeachOS on x86-64", "steps": [ - { "type": "configure", "name": "x86_64" }, - { "type": "build", "name": "x86_64-rel" } + { + "type": "configure", + "name": "x86_64" + }, + { + "type": "build", + "name": "x86_64-rel" + } ] }, { @@ -167,9 +199,18 @@ "displayName": "Build-host tests (Debug)", "description": "Unit and integration tests", "steps": [ - { "type": "configure", "name": "bht" }, - { "type": "build", "name": "bht-dbg" }, - { "type": "test", "name": "bht-dbg" } + { + "type": "configure", + "name": "bht" + }, + { + "type": "build", + "name": "bht-dbg" + }, + { + "type": "test", + "name": "bht-dbg" + } ] }, { @@ -177,9 +218,18 @@ "displayName": "Build-host tests (Release)", "description": "Unit and integration tests", "steps": [ - { "type": "configure", "name": "bht" }, - { "type": "build", "name": "bht-rel" }, - { "type": "test", "name": "bht-rel" } + { + "type": "configure", + "name": "bht" + }, + { + "type": "build", + "name": "bht-rel" + }, + { + "type": "test", + "name": "bht-rel" + } ] }, { @@ -187,9 +237,18 @@ "displayName": "Build-host stress tests (Debug)", "description": "Stress tests", "steps": [ - { "type": "configure", "name": "bht-stress" }, - { "type": "build", "name": "bht-stress-dbg" }, - { "type": "test", "name": "bht-stress-dbg" } + { + "type": "configure", + "name": "bht-stress" + }, + { + "type": "build", + "name": "bht-stress-dbg" + }, + { + "type": "test", + "name": "bht-stress-dbg" + } ] }, { @@ -197,9 +256,18 @@ "displayName": "Build-host stress tests (Release)", "description": "Stress tests", "steps": [ - { "type": "configure", "name": "bht-stress" }, - { "type": "build", "name": "bht-stress-rel" }, - { "type": "test", "name": "bht-stress-rel" } + { + "type": "configure", + "name": "bht-stress" + }, + { + "type": "build", + "name": "bht-stress-rel" + }, + { + "type": "test", + "name": "bht-stress-rel" + } ] } ] -- cgit v1.2.3