From 5748757615a945016e5be484018e0c454f367f96 Mon Sep 17 00:00:00 2001 From: Gilles Peskine Date: Wed, 26 Feb 2020 19:43:46 +0100 Subject: [PATCH] Revert "tests: Exclude version suite when used as a submodule" This reverts commit 1264c2a86f0b578b6f82a4c1993a22cbbe956a27. --- tests/CMakeLists.txt | 4 +--- tests/Makefile | 9 --------- 2 files changed, 1 insertion(+), 12 deletions(-) diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 19135c132..6b1679c5e 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -151,10 +151,8 @@ add_test_suite(psa_its) add_test_suite(shax) add_test_suite(timing) add_test_suite(rsa) +add_test_suite(version) add_test_suite(xtea) -if (NOT USE_CRYPTO_SUBMODULE) - add_test_suite(version) -endif() # Make scripts and data files needed for testing available in an # out-of-source build. diff --git a/tests/Makefile b/tests/Makefile index ae9ba85ff..15564c55e 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -66,15 +66,6 @@ endif # constructed by stripping path 'suites/' and extension .data. APPS = $(basename $(subst suites/,,$(wildcard suites/test_suite_*.data))) -# When this project is used as a submodule, exclude the following list of -# tests, which will be run from the parent module instead. -ifdef USE_CRYPTO_SUBMODULE -APPS := $(filter-out \ - test_suite_version \ - ,$(APPS)) -endif - - # Construct executable name by adding OS specific suffix $(EXEXT). BINARIES := $(addsuffix $(EXEXT),$(APPS))