i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Disable flaky/failing tests

Browse Source 
* Adjust UnitTestResource rule to allow creating directory
  structures.

Change-Id: I109688d47a457015a7b35cda9616ec4b5f40e9c5
Reviewed-on: https://review.haiku-os.org/c/haiku/+/10356
Reviewed-by: Kacper Kasper <[email protected]>
Tested-by: Commit checker robot <[email protected]>
This commit is contained in:
Kacper Kasper
2026-02-23 18:31:03 +00:00
parent 4e7218d2de
commit 63ad603268
70 changed files with 234 additions and 197 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/jam/TestsRules
+11 -8
View File
@@ -43,14 +43,16 @@ rule UnitTestLib
rule UnitTestResource
{
# UnitTestResource <target> : <source> : <flags> ;
# UnitTestResource <target> : <source> : <destDir> : <flags> ;
#
# <flags> supported values: isExec
local target = $(1:G=tests!unittests!resources) ;
local grist = [ FGrist tests unittests resources $(3) ] ;
local target = $(1:G=$(grist)) ;
local source = $(2) ;
local flags = $(3) ;
local destDir = $(3) ;
local flags = $(4) ;
MakeLocate $(target) : [ FDirName $(TARGET_UNIT_TEST_DIR) resources ] ;
MakeLocate $(target) : [ FDirName $(TARGET_UNIT_TEST_DIR) resources $(destDir) ] ;
File $(target) : $(source) ;
if isExec in $(flags) {
MODE on $(target) = $(EXEMODE) ;
@@ -58,20 +60,21 @@ rule UnitTestResource
MimeSet $(target) ;
UnitTestDependency $(target) ;
UNIT_TEST_RESOURCES on unittests += $(target) ;
DEST_DIR on $(target) = $(destDir) ;
}
rule UnitTestResources
{
# UnitTestResources <files> : <sourceDir> : <flags> ;
# UnitTestResources <files> : <destDir> : <flags> ;
#
# <flags> supports same values as UnitTestResource
local files = $(1) ;
local sourceDir = $(2) ;
local destDir = $(2) ;
local flags = $(3) ;
for file in $(files) {
LOCATE on $(file) = $(sourceDir) ;
UnitTestResource $(file:G=tests!unittests!resources) : $(file) : $(flags) ;
local fileName = $(file:BS) ;
UnitTestResource $(fileName) : $(file) : $(destDir) : $(flags) ;
}
}
build/jam/packages/HaikuUnitTests
+4 -1
View File
@@ -6,7 +6,10 @@ local executables = [ on unittests return $(UNIT_TEST_EXECUTABLES) ] ;
local resources = [ on unittests return $(UNIT_TEST_RESOURCES) ] ;
AddFilesToPackage add-ons unittests lib : $(libraries) libcppunit.so ;
AddFilesToPackage add-ons unittests resources : $(resources) ;
for resource in $(resources) {
local destDir = [ on $(resource) return $(DEST_DIR) ] ;
AddFilesToPackage add-ons unittests resources $(destDir) : $(resource) ;
}
AddFilesToPackage add-ons unittests : $(executables) ;
BuildHaikuPackage $(haikuUnitTestsPackage) : haiku_unittests ;