From 04c3776cf0c1b2c18293fec311bbddc21c84ac41 Mon Sep 17 00:00:00 2001 From: Yasuhiro Kimura Date: Sun, 20 Aug 2023 09:44:05 +0900 Subject: databases/redis*: Replace TESTS option with 'USES=tcl:test" This makes it possible to test them with default options setting. --- databases/redis-devel/Makefile | 6 ++---- databases/redis/Makefile | 6 ++---- databases/redis6/Makefile | 6 ++---- databases/redis62/Makefile | 6 ++---- databases/redis70/Makefile | 6 ++---- 5 files changed, 10 insertions(+), 20 deletions(-) diff --git a/databases/redis-devel/Makefile b/databases/redis-devel/Makefile index f264b7675b53..38fdaf0f5f3a 100644 --- a/databases/redis-devel/Makefile +++ b/databases/redis-devel/Makefile @@ -10,7 +10,7 @@ WWW= https://redis.io/ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/COPYING -USES+= compiler:c11 cpe gmake +USES+= compiler:c11 cpe gmake tcl:test CPE_VENDOR= redislabs USE_GITHUB= yes GH_TAGNAME= 6abb3c403 @@ -22,7 +22,7 @@ CONFLICTS_INSTALL= redis redis6 redis62 redis70 # etc/rc.d/redis PORTSCOUT= ignore:1 -OPTIONS_DEFINE= JEMALLOC TESTS TLS TRIB +OPTIONS_DEFINE= JEMALLOC TLS TRIB OPTIONS_DEFAULT= TLS OPTIONS_RADIO= EXTLUA OPTIONS_RADIO_EXTLUA= LUA LUAJIT @@ -31,7 +31,6 @@ OPTIONS_SUB= yes JEMALLOC_DESC= Use jemalloc LUAJIT_DESC= Use luajit instead of builtin lua LUA_DESC= Use lang/lua instead of builtin lua -TESTS_DESC= Install lang/tcl for redis unit tests TLS_DESC= Use TLS (openssl req.) TRIB_DESC= Install redis-trib.rb (lang/ruby req.) @@ -43,7 +42,6 @@ LUA_BROKEN= Fails to link LUA_USES= lua:51 LUA_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-src-Makefile.lua LUA_VARS= _ADDFLAGS=true -TESTS_USES= tcl:build TLS_USES= ssl TLS_MAKE_ENV= BUILD_TLS=yes TRIB_CATEGORIES= ruby diff --git a/databases/redis/Makefile b/databases/redis/Makefile index 1f719a5bab09..bfed1bf74ab0 100644 --- a/databases/redis/Makefile +++ b/databases/redis/Makefile @@ -10,7 +10,7 @@ WWW= https://redis.io/ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/COPYING -USES= compiler:c11 cpe gmake +USES= compiler:c11 cpe gmake tcl:test CPE_VENDOR= redislabs USE_RC_SUBR= redis sentinel @@ -37,7 +37,7 @@ PLIST_SUB= REDIS_DBDIR=${REDIS_DBDIR} \ REDIS_RUNDIR=${REDIS_RUNDIR} \ REDIS_USER=${USERS} -OPTIONS_DEFINE= JEMALLOC TESTS TLS TRIB +OPTIONS_DEFINE= JEMALLOC TLS TRIB OPTIONS_DEFAULT= TLS OPTIONS_RADIO= EXTLUA OPTIONS_RADIO_EXTLUA= LUA LUAJIT @@ -46,7 +46,6 @@ OPTIONS_SUB= yes JEMALLOC_DESC= Use jemalloc LUAJIT_DESC= Use luajit instead of builtin lua LUA_DESC= Use lang/lua instead of builtin lua -TESTS_DESC= Install lang/tcl for redis unit tests TLS_DESC= Use TLS (openssl req.) TRIB_DESC= Install redis-trib.rb (lang/ruby req.) @@ -58,7 +57,6 @@ LUA_BROKEN= Fails to link LUA_USES= lua:51 LUA_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-src-Makefile.lua LUA_VARS= _ADDFLAGS=true -TESTS_USES= tcl:build TLS_USES= ssl TLS_MAKE_ENV= BUILD_TLS=yes TRIB_CATEGORIES= ruby diff --git a/databases/redis6/Makefile b/databases/redis6/Makefile index 9b636c433bb8..f9eb3b52f9eb 100644 --- a/databases/redis6/Makefile +++ b/databases/redis6/Makefile @@ -11,7 +11,7 @@ WWW= https://redis.io/ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/COPYING -USES+= compiler:c11 gmake +USES+= compiler:c11 gmake tcl:test MAKE_ENV= OPTIMIZATION= \ V=yo @@ -20,7 +20,7 @@ CONFLICTS_INSTALL= redis redis-devel redis62 redis70 # etc/rc.d/redis PORTSCOUT= limit:^6\.0 -OPTIONS_DEFINE= JEMALLOC TESTS TLS TRIB +OPTIONS_DEFINE= JEMALLOC TLS TRIB OPTIONS_DEFAULT= TLS OPTIONS_RADIO= EXTLUA OPTIONS_RADIO_EXTLUA= LUA LUAJIT @@ -28,7 +28,6 @@ OPTIONS_SUB= yes JEMALLOC_DESC= Use jemalloc LUAJIT_DESC= Use luajit instead of builtin lua LUA_DESC= Use lang/lua instead of builtin lua -TESTS_DESC= Install lang/tcl for redis unit tests TLS_DESC= Use TLS (openssl req.) TRIB_DESC= Install redis-trib.rb (lang/ruby req.) @@ -38,7 +37,6 @@ LUAJIT_VARS= _ADDFLAGS=true LUA_USES= lua:51 LUA_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-src-Makefile.lua LUA_VARS= _ADDFLAGS=true -TESTS_USES= tcl:build TLS_USES= ssl TLS_MAKE_ENV= BUILD_TLS=yes TRIB_CATEGORIES= ruby diff --git a/databases/redis62/Makefile b/databases/redis62/Makefile index a8800e25640e..3dd562ee7809 100644 --- a/databases/redis62/Makefile +++ b/databases/redis62/Makefile @@ -11,7 +11,7 @@ WWW= https://redis.io/ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/COPYING -USES+= compiler:c11 cpe gmake +USES+= compiler:c11 cpe gmake tcl:test CPE_VENDOR= redislabs CPE_PRODUCT= redis @@ -22,7 +22,7 @@ CONFLICTS_INSTALL= redis redis-devel redis6 redis70 # etc/rc.d/redis PORTSCOUT= limit:^6\.2 -OPTIONS_DEFINE= JEMALLOC TESTS TLS TRIB +OPTIONS_DEFINE= JEMALLOC TLS TRIB OPTIONS_DEFAULT= TLS OPTIONS_RADIO= EXTLUA OPTIONS_RADIO_EXTLUA= LUA LUAJIT @@ -31,7 +31,6 @@ OPTIONS_SUB= yes JEMALLOC_DESC= Use jemalloc LUAJIT_DESC= Use luajit instead of builtin lua LUA_DESC= Use lang/lua instead of builtin lua -TESTS_DESC= Install lang/tcl for redis unit tests TLS_DESC= Use TLS (openssl req.) TRIB_DESC= Install redis-trib.rb (lang/ruby req.) @@ -43,7 +42,6 @@ LUA_BROKEN= Fails to link LUA_USES= lua:51 LUA_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-src-Makefile.lua LUA_VARS= _ADDFLAGS=true -TESTS_USES= tcl:build TLS_USES= ssl TLS_MAKE_ENV= BUILD_TLS=yes TRIB_CATEGORIES= ruby diff --git a/databases/redis70/Makefile b/databases/redis70/Makefile index 65a94c8980d5..fff8efb83b35 100644 --- a/databases/redis70/Makefile +++ b/databases/redis70/Makefile @@ -11,7 +11,7 @@ WWW= https://redis.io/ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/COPYING -USES+= compiler:c11 cpe gmake +USES+= compiler:c11 cpe gmake tcl:test CPE_VENDOR= redislabs MAKE_ENV= OPTIMIZATION= \ @@ -21,7 +21,7 @@ CONFLICTS_INSTALL= redis redis-devel redis6 redis62 # etc/rc.d/redis PORTSCOUT= limit:^7\.0 -OPTIONS_DEFINE= JEMALLOC TESTS TLS TRIB +OPTIONS_DEFINE= JEMALLOC TLS TRIB OPTIONS_DEFAULT= TLS OPTIONS_RADIO= EXTLUA OPTIONS_RADIO_EXTLUA= LUA LUAJIT @@ -30,7 +30,6 @@ OPTIONS_SUB= yes JEMALLOC_DESC= Use jemalloc LUAJIT_DESC= Use luajit instead of builtin lua LUA_DESC= Use lang/lua instead of builtin lua -TESTS_DESC= Install lang/tcl for redis unit tests TLS_DESC= Use TLS (openssl req.) TRIB_DESC= Install redis-trib.rb (lang/ruby req.) @@ -42,7 +41,6 @@ LUA_BROKEN= Fails to link LUA_USES= lua:51 LUA_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-src-Makefile.lua LUA_VARS= _ADDFLAGS=true -TESTS_USES= tcl:build TLS_USES= ssl TLS_MAKE_ENV= BUILD_TLS=yes TRIB_CATEGORIES= ruby -- cgit v1.2.3