Commit 5370a2c1 authored by Konrad Sztyber's avatar Konrad Sztyber Committed by Tomasz Zawadzki
Browse files

test: convert remaining tests using CUnit to spdk_ut_run_tests() 



The test apps that use CUnit framework for executing functional tests
were converted to use the ut library, with one exception - bdevio.
That's because bdevio uses app framework, which provides its own method
of parsing command-line arguments.

Signed-off-by: default avatarKonrad Sztyber <konrad.sztyber@intel.com>
Change-Id: Icb2bcc172686894095bb48fd4e5aae10a84d14db
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/19291


Reviewed-by: default avatarTomasz Zawadzki <tomasz.zawadzki@intel.com>
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarAleksey Marchuk <alexeymar@nvidia.com>
parent c52143cf

test/env/mem_callbacks/mem_callbacks.c

+1 −3
Original line number Diff line number Diff line
@@ -180,9 +180,7 @@ main(int argc, char **argv) 
		return CU_get_error();

	}



	CU_basic_set_mode(CU_BRM_VERBOSE);

	CU_basic_run_tests();

	num_failures = CU_get_number_of_failures();

	num_failures = spdk_ut_run_tests(argc, argv, NULL);

	CU_cleanup_registry();



	return num_failures;

test/env/memory/memory_ut.c

+1 −3
Original line number Diff line number Diff line
@@ -503,9 +503,7 @@ main(int argc, char **argv) 
		return CU_get_error();

	}



	CU_basic_set_mode(CU_BRM_VERBOSE);

	CU_basic_run_tests();

	num_failures = CU_get_number_of_failures();

	num_failures = spdk_ut_run_tests(argc, argv, NULL);

	CU_cleanup_registry();



	spdk_bit_array_free(&g_page_array);

test/env/pci/pci_ut.c

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


#include "CUnit/Basic.h"

#include "spdk_internal/mock.h"

#include "spdk_internal/cunit.h"



#include "env_dpdk/pci.c"
@@ -224,9 +225,7 @@ main(int argc, char **argv) 
		return CU_get_error();

	}



	CU_basic_set_mode(CU_BRM_VERBOSE);

	CU_basic_run_tests();

	num_failures = CU_get_number_of_failures();

	num_failures = spdk_ut_run_tests(argc, argv, NULL);

	CU_cleanup_registry();

	return num_failures;

}

test/env/vtophys/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ include $(SPDK_ROOT_DIR)/mk/spdk.modules.mk 


APP = vtophys

C_SRCS := vtophys.c

SPDK_LIB_LIST += thread util log

SPDK_LIB_LIST += thread util log ut



SYS_LIBS += -lcunit

test/env/vtophys/vtophys.c

+2 −3
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ 
#include "spdk/config.h"

#include "spdk/env.h"

#include "spdk/util.h"

#include "spdk_internal/cunit.h"



#include "CUnit/Basic.h"
@@ -160,9 +161,7 @@ main(int argc, char **argv) 
		return CU_get_error();

	}



	CU_basic_set_mode(CU_BRM_VERBOSE);

	CU_basic_run_tests();

	num_failures = CU_get_number_of_failures();

	num_failures = spdk_ut_run_tests(argc, argv, NULL);

	CU_cleanup_registry();

	return num_failures;

}