host: Move ble_hs_test.h to "test" package

This header is only needed by unit tests, so it is better placed in the
unit test package.

nimble/host/include/host/ble_hs.h

@@ -36,7 +36,6 @@
 #include "host/ble_hs_id.h"
 #include "host/ble_hs_hci.h"
 #include "host/ble_hs_log.h"
-#include "host/ble_hs_test.h"
 #include "host/ble_hs_mbuf.h"
 #include "host/ble_hs_stop.h"
 #include "host/ble_ibeacon.h"

nimble/host/include/host/ble_hs_test.h

@@ -1,61 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#ifndef H_HOST_TEST_
-#define H_HOST_TEST_
-
-#include <inttypes.h>
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-struct os_mbuf;
-
-int ble_att_clt_test_all(void);
-int ble_att_svr_test_all(void);
-int ble_gap_test_all(void);
-int ble_gatt_conn_test_all(void);
-int ble_gatt_disc_c_test_all(void);
-int ble_gatt_disc_d_test_all(void);
-int ble_gatt_disc_s_test_all(void);
-int ble_gatt_find_s_test_all(void);
-int ble_gatt_read_test_all(void);
-int ble_gatt_write_test_all(void);
-int ble_gatts_notify_test_all(void);
-int ble_gatts_read_test_suite(void);
-int ble_gatts_reg_test_all(void);
-int ble_hs_adv_test_all(void);
-int ble_hs_conn_test_all(void);
-int ble_hs_hci_test_all(void);
-int ble_hs_id_test_all(void);
-int ble_l2cap_test_all(void);
-int ble_os_test_all(void);
-int ble_hs_pvcy_test_all(void);
-int ble_sm_lgcy_test_suite(void);
-int ble_sm_sc_test_suite(void);
-int ble_sm_test_all(void);
-int ble_stop_test_all(void);
-int ble_store_test_all(void);
-int ble_uuid_test_all(void);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif

nimble/host/test/src/ble_att_clt_test.c

@@ -21,7 +21,7 @@
 #include <errno.h>
 #include "testutil/testutil.h"
 #include "nimble/ble.h"
-#include "host/ble_hs_test.h"
+#include "ble_hs_test.h"
 #include "ble_hs_test_util.h"
 
 /**

nimble/host/test/src/ble_att_svr_test.c

@@ -22,7 +22,7 @@
 #include <string.h>
 #include "testutil/testutil.h"
 #include "nimble/hci_common.h"
-#include "host/ble_hs_test.h"
+#include "ble_hs_test.h"
 #include "host/ble_uuid.h"
 #include "ble_hs_test_util.h"
 

nimble/host/test/src/ble_gap_test.c

@@ -23,7 +23,7 @@
 #include "nimble/ble.h"
 #include "nimble/hci_common.h"
 #include "host/ble_hs_adv.h"
-#include "host/ble_hs_test.h"
+#include "ble_hs_test.h"
 #include "ble_hs_test_util.h"
 
 static struct ble_gap_event ble_gap_test_event;

nimble/host/test/src/ble_gatt_conn_test.c

@@ -21,7 +21,7 @@
 #include <errno.h>
 #include "testutil/testutil.h"
 #include "nimble/ble.h"
-#include "host/ble_hs_test.h"
+#include "ble_hs_test.h"
 #include "ble_hs_test_util.h"
 
 #define BLE_GATT_BREAK_TEST_READ_ATTR_HANDLE        0x9383

nimble/host/test/src/ble_gatt_disc_c_test.c

@@ -22,7 +22,7 @@
 #include <limits.h>
 #include "testutil/testutil.h"
 #include "nimble/ble.h"
-#include "host/ble_hs_test.h"
+#include "ble_hs_test.h"
 #include "host/ble_gatt.h"
 #include "host/ble_uuid.h"
 #include "ble_hs_test_util.h"

nimble/host/test/src/ble_gatt_disc_d_test.c

@@ -22,7 +22,7 @@
 #include <limits.h>
 #include "testutil/testutil.h"
 #include "nimble/ble.h"
-#include "host/ble_hs_test.h"
+#include "ble_hs_test.h"
 #include "host/ble_gatt.h"
 #include "host/ble_uuid.h"
 #include "ble_hs_test_util.h"

nimble/host/test/src/ble_gatt_disc_s_test.c

@@ -21,7 +21,7 @@
 #include <errno.h>
 #include "testutil/testutil.h"
 #include "nimble/ble.h"
-#include "host/ble_hs_test.h"
+#include "ble_hs_test.h"
 #include "host/ble_uuid.h"
 #include "ble_hs_test_util.h"
 

nimble/host/test/src/ble_gatt_find_s_test.c

@@ -21,7 +21,7 @@
 #include <errno.h>
 #include "testutil/testutil.h"
 #include "nimble/ble.h"
-#include "host/ble_hs_test.h"
+#include "ble_hs_test.h"
 #include "host/ble_uuid.h"
 #include "ble_hs_test_util.h"
 

nimble/host/test/src/ble_gatt_read_test.c

@@ -22,7 +22,7 @@
 #include <limits.h>
 #include "testutil/testutil.h"
 #include "nimble/ble.h"
-#include "host/ble_hs_test.h"
+#include "ble_hs_test.h"
 #include "host/ble_uuid.h"
 #include "ble_hs_test_util.h"
 

nimble/host/test/src/ble_gatt_write_test.c

@@ -21,7 +21,7 @@
 #include <errno.h>
 #include "testutil/testutil.h"
 #include "nimble/ble.h"
-#include "host/ble_hs_test.h"
+#include "ble_hs_test.h"
 #include "host/ble_gatt.h"
 #include "ble_hs_test_util.h"
 

nimble/host/test/src/ble_gatts_notify_test.c

@@ -22,7 +22,7 @@
 #include "testutil/testutil.h"
 #include "nimble/ble.h"
 #include "host/ble_uuid.h"
-#include "host/ble_hs_test.h"
+#include "ble_hs_test.h"
 #include "ble_hs_test_util.h"
 
 #define BLE_GATTS_NOTIFY_TEST_CHR_1_UUID    0x1111

nimble/host/test/src/ble_gatts_read_test.c

@@ -21,7 +21,7 @@
 #include <errno.h>
 #include "testutil/testutil.h"
 #include "host/ble_uuid.h"
-#include "host/ble_hs_test.h"
+#include "ble_hs_test.h"
 #include "ble_hs_test_util.h"
 
 #define BLE_GATTS_READ_TEST_CHR_1_UUID    0x1111

nimble/host/test/src/ble_gatts_reg_test.c

@@ -22,7 +22,7 @@
 #include "testutil/testutil.h"
 #include "nimble/ble.h"
 #include "host/ble_uuid.h"
-#include "host/ble_hs_test.h"
+#include "ble_hs_test.h"
 #include "ble_hs_test_util.h"
 
 #define BLE_GATTS_REG_TEST_MAX_ENTRIES  256

nimble/host/test/src/ble_hs_adv_test.c

@@ -23,7 +23,7 @@
 #include "testutil/testutil.h"
 #include "nimble/hci_common.h"
 #include "host/ble_hs_adv.h"
-#include "host/ble_hs_test.h"
+#include "ble_hs_test.h"
 #include "ble_hs_test_util.h"
 
 #define BLE_ADV_TEST_DATA_OFF   4

nimble/host/test/src/ble_hs_conn_test.c

@@ -23,7 +23,7 @@
 #include "testutil/testutil.h"
 #include "nimble/hci_common.h"
 #include "host/ble_hs_adv.h"
-#include "host/ble_hs_test.h"
+#include "ble_hs_test.h"
 #include "ble_hs_test_util.h"
 
 static int

nimble/host/test/src/ble_hs_hci_test.c

@@ -22,7 +22,7 @@
 #include <string.h>
 #include "nimble/hci_common.h"
 #include "nimble/ble_hci_trans.h"
-#include "host/ble_hs_test.h"
+#include "ble_hs_test.h"
 #include "testutil/testutil.h"
 #include "ble_hs_test_util.h"
 

nimble/host/test/src/ble_hs_id_test.c

@@ -23,7 +23,7 @@
 #include "testutil/testutil.h"
 #include "nimble/hci_common.h"
 #include "host/ble_hs_adv.h"
-#include "host/ble_hs_test.h"
+#include "ble_hs_test.h"
 #include "ble_hs_test_util.h"
 
 static int

nimble/host/test/src/ble_hs_pvcy_test.c

@@ -21,7 +21,7 @@
 #include <errno.h>
 #include <string.h>
 #include "testutil/testutil.h"
-#include "host/ble_hs_test.h"
+#include "ble_hs_test.h"
 #include "ble_hs_test_util.h"
 
 #define BLE_HS_PVCY_TEST_MAX_GAP_EVENTS 256

nimble/host/test/src/ble_hs_stop_test.c

@@ -22,7 +22,7 @@
 #include <string.h>
 #include "testutil/testutil.h"
 #include "host/ble_hs.h"
-#include "host/ble_hs_test.h"
+#include "ble_hs_test.h"
 #include "ble_hs_test_util.h"
 
 #define BHST_MAX_EVENTS     32

nimble/host/test/src/ble_hs_test.c

@@ -21,9 +21,9 @@
 #include "syscfg/syscfg.h"
 #include "os/os.h"
 #include "nimble/hci_common.h"
-#include "host/ble_hs_test.h"
 #include "testutil/testutil.h"
 #include "ble_hs_test_util.h"
+#include "ble_hs_test.h"
 
 #if MYNEWT_VAL(SELFTEST)
 

nimble/host/test/src/ble_hs_test.h

@@ -0,0 +1,62 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+#ifndef H_BLE_HS_TEST_
+#define H_BLE_HS_TEST_
+
+#include "testutil/testutil.h"
+
+TEST_SUITE_DECL(ble_att_clt_suite);
+TEST_SUITE_DECL(ble_att_svr_suite);
+TEST_SUITE_DECL(ble_gap_test_suite_adv);
+TEST_SUITE_DECL(ble_gap_test_suite_conn_cancel);
+TEST_SUITE_DECL(ble_gap_test_suite_conn_find);
+TEST_SUITE_DECL(ble_gap_test_suite_conn_gen);
+TEST_SUITE_DECL(ble_gap_test_suite_conn_terminate);
+TEST_SUITE_DECL(ble_gap_test_suite_disc);
+TEST_SUITE_DECL(ble_gap_test_suite_mtu);
+TEST_SUITE_DECL(ble_gap_test_suite_set_cb);
+TEST_SUITE_DECL(ble_gap_test_suite_stop_adv);
+TEST_SUITE_DECL(ble_gap_test_suite_timeout);
+TEST_SUITE_DECL(ble_gap_test_suite_update_conn);
+TEST_SUITE_DECL(ble_gap_test_suite_wl);
+TEST_SUITE_DECL(ble_gatt_conn_suite);
+TEST_SUITE_DECL(ble_gatt_disc_c_test_suite);
+TEST_SUITE_DECL(ble_gatt_disc_d_test_suite);
+TEST_SUITE_DECL(ble_gatt_disc_s_test_suite);
+TEST_SUITE_DECL(ble_gatt_find_s_test_suite);
+TEST_SUITE_DECL(ble_gatt_read_test_suite);
+TEST_SUITE_DECL(ble_gatt_write_test_suite);
+TEST_SUITE_DECL(ble_gatts_notify_suite);
+TEST_SUITE_DECL(ble_gatts_read_test_suite);
+TEST_SUITE_DECL(ble_gatts_reg_suite);
+TEST_SUITE_DECL(ble_hs_adv_test_suite);
+TEST_SUITE_DECL(ble_hs_conn_suite);
+TEST_SUITE_DECL(ble_hs_hci_suite);
+TEST_SUITE_DECL(ble_hs_id_test_suite_auto);
+TEST_SUITE_DECL(ble_hs_pvcy_test_suite_irk);
+TEST_SUITE_DECL(ble_l2cap_test_suite);
+TEST_SUITE_DECL(ble_os_test_suite);
+TEST_SUITE_DECL(ble_sm_gen_test_suite);
+TEST_SUITE_DECL(ble_sm_lgcy_test_suite);
+TEST_SUITE_DECL(ble_sm_sc_test_suite);
+TEST_SUITE_DECL(ble_store_suite);
+TEST_SUITE_DECL(ble_uuid_test_suite);
+
+#endif

nimble/host/test/src/ble_l2cap_test.c

@@ -21,7 +21,7 @@
 #include <errno.h>
 #include "testutil/testutil.h"
 #include "nimble/hci_common.h"
-#include "host/ble_hs_test.h"
+#include "ble_hs_test.h"
 #include "ble_hs_test_util.h"
 
 #define BLE_L2CAP_TEST_PSM                   (90)

nimble/host/test/src/ble_os_test.c

@@ -22,7 +22,7 @@
 #include "testutil/testutil.h"
 #include "nimble/hci_common.h"
 #include "nimble/ble_hci_trans.h"
-#include "host/ble_hs_test.h"
+#include "ble_hs_test.h"
 #include "host/ble_gap.h"
 #include "ble_hs_test_util.h"
 

nimble/host/test/src/ble_sm_lgcy_test.c

@@ -24,7 +24,7 @@
 #include "nimble/hci_common.h"
 #include "nimble/nimble_opt.h"
 #include "host/ble_sm.h"
-#include "host/ble_hs_test.h"
+#include "ble_hs_test.h"
 #include "ble_hs_test_util.h"
 #include "ble_sm_test_util.h"
 

nimble/host/test/src/ble_sm_sc_test.c

@@ -24,7 +24,7 @@
 #include "nimble/hci_common.h"
 #include "nimble/nimble_opt.h"
 #include "host/ble_sm.h"
-#include "host/ble_hs_test.h"
+#include "ble_hs_test.h"
 #include "ble_hs_test_util.h"
 #include "ble_sm_test_util.h"
 

nimble/host/test/src/ble_sm_test.c

@@ -24,7 +24,7 @@
 #include "nimble/hci_common.h"
 #include "nimble/nimble_opt.h"
 #include "host/ble_sm.h"
-#include "host/ble_hs_test.h"
+#include "ble_hs_test.h"
 #include "ble_hs_test_util.h"
 #include "ble_sm_test_util.h"
 

nimble/host/test/src/ble_sm_test_util.c

@@ -24,7 +24,7 @@
 #include "nimble/hci_common.h"
 #include "nimble/nimble_opt.h"
 #include "host/ble_sm.h"
-#include "host/ble_hs_test.h"
+#include "ble_hs_test.h"
 #include "host/ble_hs_id.h"
 #include "ble_hs_test_util.h"
 #include "ble_sm_test_util.h"

nimble/host/test/src/ble_store_test.c

@@ -18,7 +18,7 @@
  */
 
 #include "testutil/testutil.h"
-#include "host/ble_hs_test.h"
+#include "ble_hs_test.h"
 #include "ble_hs_test_util.h"
 
 static struct ble_store_status_event ble_store_test_status_event;

nimble/host/test/src/ble_uuid_test.c

@@ -20,7 +20,7 @@
 #include <stddef.h>
 #include <string.h>
 #include "testutil/testutil.h"
-#include "host/ble_hs_test.h"
+#include "ble_hs_test.h"
 #include "host/ble_uuid.h"
 #include "ble_hs_test_util.h"