jeltz/hostap
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

tests: Declare module test functions in a header file

Browse source 
This gets rid of number of warnings from sparse.

Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
This commit is contained in:
Jouni Malinen 2016-06-23 18:19:00 +03:00 committed by Jouni Malinen
parent 3e624369cb
commit 50a17a76e1
9 changed files with 36 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
hostapd/ctrl_iface.c
View file

@ -25,6 +25,7 @@
#include "utils/common.h"
#include "utils/eloop.h"
#include "utils/module_tests.h"
#include "common/version.h"
#include "common/ieee802_11_defs.h"
#include "common/ctrl_iface_common.h"
@ -3339,7 +3340,6 @@ static void hostapd_global_ctrl_iface_receive(int sock, void *eloop_ctx,
reply_len = -1;
#ifdef CONFIG_MODULE_TESTS
} else if (os_strcmp(buf, "MODULE_TESTS") == 0) {
int hapd_module_tests(void);
if (hapd_module_tests() < 0)
reply_len = -1;
#endif /* CONFIG_MODULE_TESTS */

1
hostapd/hapd_module_tests.c
View file

@ -9,6 +9,7 @@
#include "utils/includes.h"
#include "utils/common.h"
#include "utils/module_tests.h"
int hapd_module_tests(void)
{

1
src/common/common_module_tests.c
View file

@ -9,6 +9,7 @@
#include "utils/includes.h"
#include "utils/common.h"
#include "utils/module_tests.h"
#include "ieee802_11_common.h"
#include "ieee802_11_defs.h"
#include "gas.h"

1
src/crypto/crypto_module_tests.c
View file

@ -9,6 +9,7 @@
#include "utils/includes.h"
#include "utils/common.h"
#include "utils/module_tests.h"
#include "crypto/aes_siv.h"
#include "crypto/aes_wrap.h"
#include "crypto/aes.h"

20
src/utils/module_tests.h Normal file
View file

@ -0,0 +1,20 @@
/*
* Module tests
* Copyright (c) 2014-2015, Jouni Malinen <j@w1.fi>
*
* This software may be distributed under the terms of the BSD license.
* See README for more details.
*/
#ifndef MODULE_TESTS_H
#define MODULE_TESTS_H
int wpas_module_tests(void);
int hapd_module_tests(void);
int utils_module_tests(void);
int wps_module_tests(void);
int common_module_tests(void);
int crypto_module_tests(void);
#endif /* MODULE_TESTS_H */

1
src/utils/utils_module_tests.c
View file

@ -16,6 +16,7 @@
#include "utils/base64.h"
#include "utils/ip_addr.h"
#include "utils/eloop.h"
#include "utils/module_tests.h"
struct printf_test_data {

1
src/wps/wps_module_tests.c
View file

@ -9,6 +9,7 @@
#include "utils/includes.h"
#include "utils/common.h"
#include "utils/module_tests.h"
#include "wps_attr_parse.h"
struct wps_attr_parse_test {

2
wpa_supplicant/ctrl_iface.c
View file

@ -15,6 +15,7 @@
#include "utils/common.h"
#include "utils/eloop.h"
#include "utils/uuid.h"
#include "utils/module_tests.h"
#include "common/version.h"
#include "common/ieee802_11_defs.h"
#include "common/ieee802_11_common.h"
@ -10021,7 +10022,6 @@ char * wpa_supplicant_global_ctrl_iface_process(struct wpa_global *global,
reply_size);
#ifdef CONFIG_MODULE_TESTS
} else if (os_strcmp(buf, "MODULE_TESTS") == 0) {
int wpas_module_tests(void);
if (wpas_module_tests() < 0)
reply_len = -1;
#endif /* CONFIG_MODULE_TESTS */

29
wpa_supplicant/wpas_module_tests.c
View file

@ -9,6 +9,7 @@
#include "utils/includes.h"
#include "utils/common.h"
#include "utils/module_tests.h"
#include "wpa_supplicant_i.h"
#include "blacklist.h"
@ -79,30 +80,18 @@ int wpas_module_tests(void)
ret = -1;
#ifdef CONFIG_WPS
{
int wps_module_tests(void);
if (wps_module_tests() < 0)
ret = -1;
}
if (wps_module_tests() < 0)
ret = -1;
#endif /* CONFIG_WPS */
{
int utils_module_tests(void);
if (utils_module_tests() < 0)
ret = -1;
}
if (utils_module_tests() < 0)
ret = -1;
{
int common_module_tests(void);
if (common_module_tests() < 0)
ret = -1;
}
if (common_module_tests() < 0)
ret = -1;
{
int crypto_module_tests(void);
if (crypto_module_tests() < 0)
ret = -1;
}
if (crypto_module_tests() < 0)
ret = -1;
return ret;
}