Skip to content

Commit

Permalink
databases/redis*: Replace TESTS option with 'USES=tcl:test"
Browse files Browse the repository at this point in the history
This makes it possible to test them with default options setting.
  • Loading branch information
Yasuhiro Kimura authored and Yasuhiro Kimura committed Aug 20, 2023
1 parent 0f5dd65 commit 04c3776
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 20 deletions.
6 changes: 2 additions & 4 deletions databases/redis-devel/Makefile
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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.)

Expand All @@ -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
Expand Down
6 changes: 2 additions & 4 deletions databases/redis/Makefile
Expand Up @@ -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

Expand All @@ -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
Expand All @@ -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.)

Expand All @@ -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
Expand Down
6 changes: 2 additions & 4 deletions databases/redis6/Makefile
Expand Up @@ -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
Expand All @@ -20,15 +20,14 @@ 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
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.)

Expand All @@ -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
Expand Down
6 changes: 2 additions & 4 deletions databases/redis62/Makefile
Expand Up @@ -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

Expand All @@ -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
Expand All @@ -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.)

Expand All @@ -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
Expand Down
6 changes: 2 additions & 4 deletions databases/redis70/Makefile
Expand Up @@ -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= \
Expand All @@ -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
Expand All @@ -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.)

Expand All @@ -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
Expand Down

0 comments on commit 04c3776

Please sign in to comment.