Skip to content

Commit

Permalink
test/jemalloc: notch *allocm out from CheriBSD
Browse files Browse the repository at this point in the history
  • Loading branch information
nwf-msr committed Jan 5, 2024
1 parent 1e926a7 commit a85d0ef
Showing 1 changed file with 13 additions and 0 deletions.
13 changes: 13 additions & 0 deletions src/test/func/jemalloc/jemalloc.cc
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,17 @@
* exported from libc.
*/
# define TEST_JEMALLOC_MALLOCX

# if !defined(__CHERI_PURE_CAPABILITY__)
/**
* CheriBSD 2023.11 removes the exports of jemalloc's {,r,s,d,n}allocm
* functions, so be slightly more judicious about where we test those. There's
* relatively little utility in testing those on older CheriBSD releases, so
* just notch out all of CheriBSD.
*/
# define TEST_JEMALLOC_ALLOCM
# endif

#endif

#define OUR_MALLOCX_LG_ALIGN(la) (static_cast<int>(la))
Expand Down Expand Up @@ -365,6 +376,8 @@ int main()
test_size<mallocx, dallocx, sallocx, nallocx>();
test_zeroing<mallocx, dallocx, rallocx>();
test_xallocx<mallocx, dallocx, xallocx>();
#endif
#ifdef TEST_JEMALLOC_ALLOCM
test_legacy_experimental_apis<allocm, rallocm, sallocm, dallocm, nallocm>();
#endif
}

0 comments on commit a85d0ef

Please sign in to comment.