DGNum/hostapd
6
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

Make CONFIG_TESTING_OPTIONS=y enable all testing options

Browse source 
This makes it easier to enable various testing parameters and
functionality in build configuration.

Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
This commit is contained in:
Jouni Malinen 2013-11-28 15:34:24 +02:00 committed by Jouni Malinen
parent 662b40b16b
commit 9d2cb3ec94
5 changed files with 17 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
hostapd/Makefile
View file

@ -15,6 +15,11 @@ CFLAGS += -I$(abspath ../src/utils)
-include .config -include .config
ifdef CONFIG_TESTING_OPTIONS
CFLAGS += -DCONFIG_TESTING_OPTIONS
CONFIG_WPS_TESTING=y
endif
ifndef CONFIG_OS ifndef CONFIG_OS
ifdef CONFIG_NATIVE_WINDOWS ifdef CONFIG_NATIVE_WINDOWS
CONFIG_OS=win32 CONFIG_OS=win32
@ -858,10 +863,6 @@ LIBS += -lsqlite3
LIBS_h += -lsqlite3 LIBS_h += -lsqlite3
endif endif
ifdef CONFIG_TESTING_OPTIONS
CFLAGS += -DCONFIG_TESTING_OPTIONS
endif
ALL=hostapd hostapd_cli ALL=hostapd hostapd_cli
all: verify_config $(ALL) all: verify_config $(ALL)

2
tests/hwsim/example-hostapd.config
View file

@ -68,3 +68,5 @@ CONFIG_HS20=y
#CONFIG_SQLITE=y #CONFIG_SQLITE=y
CONFIG_SAE=y CONFIG_SAE=y
CFLAGS += -DALL_DH_GROUPS CFLAGS += -DALL_DH_GROUPS
CONFIG_TESTING_OPTIONS=y

2
tests/hwsim/example-wpa_supplicant.config
View file

@ -110,6 +110,8 @@ CFLAGS += -DALL_DH_GROUPS
CONFIG_WNM=y CONFIG_WNM=y
CONFIG_TESTING_OPTIONS=y
# gcov code coverage from the virtual machine # gcov code coverage from the virtual machine
#CONFIG_CODE_COVERAGE=y #CONFIG_CODE_COVERAGE=y
#CFLAGS += -fprofile-dir=/tmp/logs/gcov #CFLAGS += -fprofile-dir=/tmp/logs/gcov

6
wpa_supplicant/Makefile
View file

@ -15,6 +15,12 @@ CFLAGS += -I$(abspath ../src/utils)
-include .config -include .config
ifdef CONFIG_TESTING_OPTIONS
CFLAGS += -DCONFIG_TESTING_OPTIONS
CONFIG_WPS_TESTING=y
CONFIG_TDLS_TESTING=y
endif
BINALL=wpa_supplicant wpa_cli BINALL=wpa_supplicant wpa_cli
ifndef CONFIG_NO_WPA_PASSPHRASE ifndef CONFIG_NO_WPA_PASSPHRASE

4
wpa_supplicant/ctrl_iface.c
View file

@ -361,13 +361,13 @@ static int wpa_supplicant_ctrl_iface_set(struct wpa_supplicant *wpa_s,
} else if (os_strcasecmp(cmd, "ampdu") == 0) { } else if (os_strcasecmp(cmd, "ampdu") == 0) {
if (wpa_drv_ampdu(wpa_s, atoi(value)) < 0) if (wpa_drv_ampdu(wpa_s, atoi(value)) < 0)
ret = -1; ret = -1;
#ifdef CONFIG_TDLS
#ifdef CONFIG_TDLS_TESTING #ifdef CONFIG_TDLS_TESTING
} else if (os_strcasecmp(cmd, "tdls_testing") == 0) { } else if (os_strcasecmp(cmd, "tdls_testing") == 0) {
extern unsigned int tdls_testing; extern unsigned int tdls_testing;
tdls_testing = strtol(value, NULL, 0); tdls_testing = strtol(value, NULL, 0);
wpa_printf(MSG_DEBUG, "TDLS: tdls_testing=0x%x", tdls_testing); wpa_printf(MSG_DEBUG, "TDLS: tdls_testing=0x%x", tdls_testing);
#endif /* CONFIG_TDLS_TESTING */ #endif /* CONFIG_TDLS_TESTING */
#ifdef CONFIG_TDLS
} else if (os_strcasecmp(cmd, "tdls_disabled") == 0) { } else if (os_strcasecmp(cmd, "tdls_disabled") == 0) {
int disabled = atoi(value); int disabled = atoi(value);
wpa_printf(MSG_DEBUG, "TDLS: tdls_disabled=%d", disabled); wpa_printf(MSG_DEBUG, "TDLS: tdls_disabled=%d", disabled);
@ -5172,11 +5172,11 @@ static void wpa_supplicant_ctrl_iface_flush(struct wpa_supplicant *wpa_s)
wpa_s->after_wps = 0; wpa_s->after_wps = 0;
wpa_s->known_wps_freq = 0; wpa_s->known_wps_freq = 0;
#ifdef CONFIG_TDLS
#ifdef CONFIG_TDLS_TESTING #ifdef CONFIG_TDLS_TESTING
extern unsigned int tdls_testing; extern unsigned int tdls_testing;
tdls_testing = 0; tdls_testing = 0;
#endif /* CONFIG_TDLS_TESTING */ #endif /* CONFIG_TDLS_TESTING */
#ifdef CONFIG_TDLS
wpa_drv_tdls_oper(wpa_s, TDLS_ENABLE, NULL); wpa_drv_tdls_oper(wpa_s, TDLS_ENABLE, NULL);
wpa_tdls_enable(wpa_s->wpa, 1); wpa_tdls_enable(wpa_s->wpa, 1);
#endif /* CONFIG_TDLS */ #endif /* CONFIG_TDLS */