Commit 9102eef7 authored by Ben Walker's avatar Ben Walker
Browse files

Revert "test/bdevio: add delay before starting unit tests" 

This reverts commit be2cb0c5.

Change-Id: Ie337700dbedbd2e5a57afcfb8bd256bd344db4c1
Reviewed-on: https://review.gerrithub.io/387683


Reviewed-by: default avatarDariusz Stojaczyk <dariuszx.stojaczyk@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Tested-by: default avatarSPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: default avatarDaniel Verkamp <daniel.verkamp@intel.com>
parent 435138b7

test/lib/bdev/bdevio/bdevio.c

+3 −11
Original line number Diff line number Diff line
@@ -54,7 +54,6 @@ 


pthread_mutex_t g_test_mutex;

pthread_cond_t g_test_cond;

struct spdk_poller *g_start_timer;



struct io_target {

	struct spdk_bdev	*bdev;
@@ -913,12 +912,10 @@ __run_ut_thread(void *arg1, void *arg2) 
}



static void

test_main(void *arg1)

test_main(void *arg1, void *arg2)

{

	struct spdk_event *event;



	spdk_poller_unregister(&g_start_timer, NULL);



	pthread_mutex_init(&g_test_mutex, NULL);

	pthread_cond_init(&g_test_cond, NULL);
@@ -931,12 +928,6 @@ test_main(void *arg1) 
	spdk_event_call(event);

}



static void

start_timer(void *arg1, void *arg2)

{

	spdk_poller_register(&g_start_timer, test_main, NULL, LCORE_ID_INIT, 1000 * 1000);

}



int

main(int argc, char **argv)

{
@@ -949,10 +940,11 @@ main(int argc, char **argv) 
	} else {

		config_file = argv[1];

	}



	bdevtest_init(config_file, "0x7", &opts);

	opts.rpc_addr = NULL;



	num_failures = spdk_app_start(&opts, start_timer, NULL, NULL);

	num_failures = spdk_app_start(&opts, test_main, NULL, NULL);

	spdk_app_fini();



	return num_failures;