Commit ca1de9eb authored by Jim Harris's avatar Jim Harris
Browse files

test: remove spdk_cunit library 



There was a plan a long time ago to try to output all
unit test results in JSON format for post-processing.
It is used by only one unit test file currently, but the
results aren't used and there are no plans to use it in
the future or extend it to other unit tests.

Signed-off-by: default avatarJim Harris <james.r.harris@intel.com>
Change-Id: I72c409090bbd7b8fa7ec307bbc97f97ccf2e397c

Reviewed-on: https://review.gerrithub.io/418112


Reviewed-by: default avatarDaniel Verkamp <daniel.verkamp@intel.com>
Reviewed-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
Tested-by: default avatarSPDK Automated Test System <sys_sgsw@intel.com>
parent 56d35c5d

lib/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -37,7 +37,6 @@ include $(SPDK_ROOT_DIR)/mk/spdk.common.mk 
DIRS-y += bdev blob blobfs conf copy event json jsonrpc \

          log lvol net rpc sock thread trace util nvme nvmf scsi ioat \

	  ut_mock iscsi

DIRS-$(CONFIG_TESTS) += cunit

ifeq ($(OS),Linux)

DIRS-y += nbd

DIRS-$(CONFIG_VHOST) += vhost

lib/cunit/Makefile

deleted100644 → 0
+0 −41
Original line number Diff line number Diff line 
#

#  BSD LICENSE

#

#  Copyright (c) Intel Corporation.

#  All rights reserved.

#

#  Redistribution and use in source and binary forms, with or without

#  modification, are permitted provided that the following conditions

#  are met:

#

#    * Redistributions of source code must retain the above copyright

#      notice, this list of conditions and the following disclaimer.

#    * Redistributions in binary form must reproduce the above copyright

#      notice, this list of conditions and the following disclaimer in

#      the documentation and/or other materials provided with the

#      distribution.

#    * Neither the name of Intel Corporation nor the names of its

#      contributors may be used to endorse or promote products derived

#      from this software without specific prior written permission.

#

#  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS

#  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT

#  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR

#  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT

#  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,

#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT

#  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,

#  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY

#  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT

#  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE

#  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

#



SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..)

include $(SPDK_ROOT_DIR)/mk/spdk.common.mk



CFLAGS += -I$(SPDK_ROOT_DIR)/test

C_SRCS = spdk_cunit.c

LIBNAME = cunit



include $(SPDK_ROOT_DIR)/mk/spdk.lib.mk

lib/cunit/spdk_cunit.c

deleted100644 → 0
+0 −112
Original line number Diff line number Diff line 
/*-

 *   BSD LICENSE

 *

 *   Copyright (c) Intel Corporation.

 *   All rights reserved.

 *

 *   Redistribution and use in source and binary forms, with or without

 *   modification, are permitted provided that the following conditions

 *   are met:

 *

 *     * Redistributions of source code must retain the above copyright

 *       notice, this list of conditions and the following disclaimer.

 *     * Redistributions in binary form must reproduce the above copyright

 *       notice, this list of conditions and the following disclaimer in

 *       the documentation and/or other materials provided with the

 *       distribution.

 *     * Neither the name of Intel Corporation nor the names of its

 *       contributors may be used to endorse or promote products derived

 *       from this software without specific prior written permission.

 *

 *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS

 *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT

 *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR

 *   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT

 *   OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,

 *   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT

 *   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,

 *   DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY

 *   THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT

 *   (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE

 *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

 */



#include "spdk/stdinc.h"



#include "spdk_cunit.h"



static int

spdk_cunit_get_test_result(CU_pTest test)

{

	CU_pFailureRecord failure = CU_get_failure_list();



	while (failure != NULL) {

		if (failure->pTest == test) {

			return 1;

		}

		failure = failure->pNext;

	}



	return 0;

}



static void

spdk_cunit_print_test_result(FILE *out, CU_pTest test)

{

	fprintf(out, "    {\n");

	fprintf(out, "      \"Name\" : \"%s\",\n", test->pName);

	fprintf(out, "      \"Result\" : \"%s\"\n",

		spdk_cunit_get_test_result(test) ? "FAIL" : "PASS");

	fprintf(out, "    }\n");

}



static void

spdk_cunit_print_suite_result(FILE *out, CU_pSuite suite)

{

	CU_pTest test = suite->pTest;



	while (test != NULL) {

		spdk_cunit_print_test_result(out, test);

		test = test->pNext;

		if (test != NULL) {

			fprintf(out, "    ,\n");

		}

	}

}



static void

spdk_cunit_print_registry_result(FILE *out, CU_pTestRegistry registry)

{

	CU_pSuite suite = registry->pSuite;



	if (suite == NULL) {

		return;

	}



	fprintf(out, "{\n");

	fprintf(out, "  \"%s unit tests\": [\n", suite->pName);



	while (suite != NULL) {

		spdk_cunit_print_suite_result(out, suite);

		suite = suite->pNext;

	}



	fprintf(out, "  ]\n");

	fprintf(out, "}\n");

}



int

spdk_cunit_print_results(const char *filename)

{

	FILE *out;



	out = fopen(filename, "w");

	if (out == NULL) {

		fprintf(stderr, "could not open results file %s\n", filename);

		return -1;

	}



	spdk_cunit_print_registry_result(out, CU_get_registry());

	fclose(out);

	return 0;

}

test/unit/lib/scsi/lun.c/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -35,7 +35,6 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../../..) 
include $(SPDK_ROOT_DIR)/mk/spdk.common.mk

include $(SPDK_ROOT_DIR)/mk/spdk.app.mk



SPDK_LIB_LIST = cunit

TEST_FILE = lun_ut.c



include $(SPDK_ROOT_DIR)/mk/spdk.unittest.mk

test/unit/lib/scsi/lun.c/lun_ut.c

+0 −10
Original line number Diff line number Diff line
@@ -599,7 +599,6 @@ main(int argc, char **argv) 
{

	CU_pSuite	suite = NULL;

	unsigned int	num_failures;

	int		rc;



	if (CU_initialize_registry() != CUE_SUCCESS) {

		return CU_get_error();
@@ -649,15 +648,6 @@ main(int argc, char **argv) 
	CU_basic_set_mode(CU_BRM_VERBOSE);

	CU_basic_run_tests();

	num_failures = CU_get_number_of_failures();



	if (argc > 1) {

		rc = spdk_cunit_print_results(argv[1]);

		if (rc != 0) {

			CU_cleanup_registry();

			return rc;

		}

	}



	CU_cleanup_registry();

	return num_failures;

}