Commit 999d6df4 authored by Ben Walker's avatar Ben Walker Committed by Jim Harris
Browse files

test: Use ut_multithread framework in bdev/part test



Change-Id: Ia8a27251ee87d0784e0a26dc2dbecf787356da2d
Signed-off-by: default avatarBen Walker <benjamin.walker@intel.com>
Reviewed-on: https://review.gerrithub.io/422471


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Chandler-Test-Pool: SPDK Automated Test System <sys_sgsw@intel.com>
parent 62529ca8
Loading
Loading
Loading
Loading
+9 −11
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@

#include "spdk_cunit.h"

#include "common/lib/test_env.c"
#include "common/lib/ut_multithread.c"
#include "unit/lib/json_mock.c"

#include "spdk/config.h"
@@ -62,12 +62,6 @@ DEFINE_STUB_V(spdk_trace_register_description, (const char *name, const char *sh
DEFINE_STUB_V(_spdk_trace_record, (uint64_t tsc, uint16_t tpoint_id, uint16_t poller_id,
				   uint32_t size, uint64_t object_id, uint64_t arg1));

static void
_part_send_msg(spdk_msg_fn fn, void *ctx, void *thread_ctx)
{
	fn(ctx);
}

static void
_part_cleanup(struct spdk_bdev_part *part)
{
@@ -146,12 +140,13 @@ part_test(void)
	_part_cleanup(&part1);
	_part_cleanup(&part2);
	spdk_bdev_unregister(&bdev_base, NULL, NULL);

	poll_threads();
}

int
main(int argc, char **argv)
{
	struct spdk_thread	*thread;
	CU_pSuite		suite = NULL;
	unsigned int		num_failures;

@@ -172,12 +167,15 @@ main(int argc, char **argv)
		return CU_get_error();
	}

	thread = spdk_allocate_thread(_part_send_msg, NULL, NULL, NULL, "thread0");
	spdk_set_thread(thread);
	allocate_threads(1);
	set_thread(0);

	CU_basic_set_mode(CU_BRM_VERBOSE);
	CU_basic_run_tests();
	num_failures = CU_get_number_of_failures();
	CU_cleanup_registry();
	spdk_free_thread();

	free_threads();

	return num_failures;
}