Commit 14ccaed6 authored by Seth Howell's avatar Seth Howell Committed by Jim Harris
Browse files

test/unit: fix scan-build errors in the event tests 



Change-Id: I459c8cdea080af24374c2ad1fa42e291c5021840
Signed-off-by: default avatarSeth Howell <seth.howell@intel.com>
Reviewed-on: https://review.gerrithub.io/423950


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
parent 438b71d1

test/unit/lib/event/app.c/app_ut.c

+11 −7
Original line number Diff line number Diff line
@@ -117,12 +117,13 @@ test_spdk_app_parse_args(void) 
						       };



	/* Test valid arguments. Expected result: PASS */

	rc = spdk_app_parse_args(test_argc, valid_argv, &opts, "", NULL, NULL, NULL);

	rc = spdk_app_parse_args(test_argc, valid_argv, &opts, "", NULL, unittest_parse_args, NULL);

	CU_ASSERT_EQUAL(rc, SPDK_APP_PARSE_ARGS_SUCCESS);

	optind = 1;



	/* Test invalid short option Expected result: FAIL */

	rc = spdk_app_parse_args(test_argc, argv_added_short_opt, &opts, "", NULL, NULL, NULL);

	rc = spdk_app_parse_args(test_argc, argv_added_short_opt, &opts, "", NULL, unittest_parse_args,

				 NULL);

	CU_ASSERT_EQUAL(rc, SPDK_APP_PARSE_ARGS_FAIL);

	optind = 1;
@@ -133,7 +134,8 @@ test_spdk_app_parse_args(void) 
	optind = 1;



	/* Test invalid long option Expected result: FAIL */

	rc = spdk_app_parse_args(test_argc, argv_added_long_opt, &opts, "", NULL, NULL, NULL);

	rc = spdk_app_parse_args(test_argc, argv_added_long_opt, &opts, "", NULL, unittest_parse_args,

				 NULL);

	CU_ASSERT_EQUAL(rc, SPDK_APP_PARSE_ARGS_FAIL);

	optind = 1;
@@ -145,7 +147,8 @@ test_spdk_app_parse_args(void) 
	optind = 1;



	/* Test overlapping global and local options. Expected result: FAIL */

	rc = spdk_app_parse_args(test_argc, valid_argv, &opts, SPDK_APP_GETOPT_STRING, NULL, NULL, NULL);

	rc = spdk_app_parse_args(test_argc, valid_argv, &opts, SPDK_APP_GETOPT_STRING, NULL,

				 unittest_parse_args, NULL);

	CU_ASSERT_EQUAL(rc, SPDK_APP_PARSE_ARGS_FAIL);

	optind = 1;
@@ -153,17 +156,18 @@ test_spdk_app_parse_args(void) 
	for (i = 0; i < SPDK_APP_MAX_CMDLINE_OPTIONS; i++) {

		my_options[i].name = name_teaser;

	}

	rc = spdk_app_parse_args(test_argc, valid_argv, &opts, "", my_options, NULL, NULL);

	rc = spdk_app_parse_args(test_argc, valid_argv, &opts, "", my_options, unittest_parse_args, NULL);

	CU_ASSERT_EQUAL(rc, SPDK_APP_PARSE_ARGS_FAIL);

	optind = 1;



	/* Specify -B and -W options at the same time. Expected result: FAIL */

	rc = spdk_app_parse_args(test_argc, invalid_argv_BW, &opts, "", NULL, NULL, NULL);

	rc = spdk_app_parse_args(test_argc, invalid_argv_BW, &opts, "", NULL, unittest_parse_args, NULL);

	CU_ASSERT_EQUAL(rc, SPDK_APP_PARSE_ARGS_FAIL);

	optind = 1;



	/* Omit necessary argument to option */

	rc = spdk_app_parse_args(test_argc, invalid_argv_missing_option, &opts, "", NULL, NULL, NULL);

	rc = spdk_app_parse_args(test_argc, invalid_argv_missing_option, &opts, "", NULL,

				 unittest_parse_args, NULL);

	CU_ASSERT_EQUAL(rc, SPDK_APP_PARSE_ARGS_FAIL);

	optind = 1;

}

test/unit/lib/event/subsystem.c/subsystem_ut.c

+6 −2
Original line number Diff line number Diff line
@@ -75,9 +75,13 @@ spdk_event_allocate(uint32_t core, spdk_event_fn fn, void *arg1, void *arg2) 


void spdk_event_call(struct spdk_event *event)

{

	if (event != NULL) {

		if (event->fn != NULL) {

			event->fn(event->arg1, event->arg2);

		}

		free(event);

	}

}



static void

set_up_subsystem(struct spdk_subsystem *subsystem, const char *name)