Skip to content

Commit 9c60e4c

Browse files
committed
add funk unit tests to ci
1 parent c75e218 commit 9c60e4c

File tree

5 files changed

+11
-4
lines changed

5 files changed

+11
-4
lines changed

src/funk/Local.mk

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,21 @@ ifdef FD_HAS_ATOMIC
22
$(call add-hdrs,fd_funk_base.h fd_funk_txn.h fd_funk_rec.h fd_funk_val.h fd_funk_filemap.h fd_funk.h)
33
$(call add-objs,fd_funk_base fd_funk_txn fd_funk_rec fd_funk_val fd_funk_filemap fd_funk,fd_funk)
44
$(call make-unit-test,test_funk_base,test_funk_base,fd_funk fd_util)
5+
$(call run-unit-test,test_funk_base,)
56
$(call make-unit-test,test_funk,test_funk,fd_funk fd_util)
7+
$(call run-unit-test,test_funk,)
68
$(call make-unit-test,test_funk_concur,test_funk_concur,fd_funk fd_util)
9+
$(call run-unit-test,test_funk_concur,)
710
$(call make-unit-test,test_funk_rec,test_funk_rec test_funk_common,fd_funk fd_util)
11+
$(call run-unit-test,test_funk_rec,)
812
$(call make-unit-test,test_funk_txn,test_funk_txn test_funk_common,fd_funk fd_util)
13+
$(call run-unit-test,test_funk_txn,)
914
$(call make-unit-test,test_funk_val,test_funk_val test_funk_common,fd_funk fd_util)
1015
ifdef FD_HAS_HOSTED
1116
$(call make-unit-test,test_funk_txn2,test_funk_txn2,fd_funk fd_util)
17+
$(call run-unit-test,test_funk_txn2,)
1218
$(call make-unit-test,test_funk_file,test_funk_file,fd_funk fd_util)
19+
$(call run-unit-test,test_funk_file,)
1320
$(call make-unit-test,bench_funk_index,bench_funk_index,fd_funk fd_util)
1421
endif
1522
endif

src/funk/bench_funk_index.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ main( int argc,
5353

5454
char const * name = fd_env_strip_cmdline_cstr ( &argc, &argv, "--wksp", NULL, NULL );
5555
char const * _page_sz = fd_env_strip_cmdline_cstr ( &argc, &argv, "--page-sz", NULL, "gigantic" );
56-
ulong page_cnt = fd_env_strip_cmdline_ulong ( &argc, &argv, "--page-cnt", NULL, 3UL );
56+
ulong page_cnt = fd_env_strip_cmdline_ulong ( &argc, &argv, "--page-cnt", NULL, 128UL );
5757
ulong near_cpu = fd_env_strip_cmdline_ulong ( &argc, &argv, "--near-cpu", NULL, fd_log_cpu_id() );
5858
double acc_cnt_d = fd_env_strip_cmdline_double( &argc, &argv, "--accounts", NULL, 1e9 );
5959
double rec_max_d = fd_env_strip_cmdline_double( &argc, &argv, "--rec-max", NULL, 1e9 );

src/funk/test_funk.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ main( int argc,
8888
#ifdef FD_FUNK_HANDHOLDING
8989
FD_TEST( !fd_funk_delete( NULL ) ); /* NULL shmem */
9090
FD_TEST( !fd_funk_delete( (void *)1UL ) ); /* misaligned shmem */
91-
FD_TEST( !fd_funk_delete( (void *)align ) ); /* not wksp addr */
91+
FD_TEST( !fd_funk_delete( (uchar*)shfunk + align ) ); /* wrong pointer */
9292
#endif
9393
FD_TEST( fd_funk_delete( shfunk )==shmem ); /* NULL shmem */
9494

src/funk/test_funk_concur.cxx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ int main(int argc, char** argv) {
117117
fd_funk_txn_xid_t xid;
118118
memset(&xid, 0, sizeof(xid));
119119

120-
for (uint loop = 0; loop < 60U; ++loop) {
120+
for (uint loop = 0; loop < 10U; ++loop) {
121121
for( uint i = 0; i < 2; ++i ) {
122122
auto * txn = state.pick_txn(false);
123123
if( txn == NULL ) continue;

src/funk/test_funk_txn2.cxx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ int main(int argc, char** argv) {
66

77
fake_funk ff(&argc, &argv);
88
ff.verify();
9-
for (uint loop = 0; loop < 5000U; ++loop) {
9+
for (uint loop = 0; loop < 2000U; ++loop) {
1010
for (uint i = 0; i < 10; ++i)
1111
ff.random_insert();
1212
ff.verify();

0 commit comments

Comments
 (0)