This is an automated email from the ASF dual-hosted git repository. andk pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/mynewt-nimble.git
commit 2f984a3c3ec388a5e511179ff2c0e40db1a63368 Author: Andrzej Kaczmarek <[email protected]> AuthorDate: Fri Jan 27 20:25:11 2023 +0100 nimble/ll/test: Cleanup tests --- nimble/controller/include/controller/ble_ll_test.h | 35 ---------------------- nimble/controller/test/src/ble_ll_csa2_test.c | 11 +++---- nimble/controller/test/src/ble_ll_csa2_test.h | 27 ----------------- nimble/controller/test/src/ble_ll_test.c | 10 +++---- 4 files changed, 8 insertions(+), 75 deletions(-) diff --git a/nimble/controller/include/controller/ble_ll_test.h b/nimble/controller/include/controller/ble_ll_test.h deleted file mode 100644 index 32984c6b..00000000 --- a/nimble/controller/include/controller/ble_ll_test.h +++ /dev/null @@ -1,35 +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_LL_TEST_ -#define H_LL_TEST_ - -#include <stddef.h> - -#ifdef __cplusplus -extern "C" { -#endif - -int ble_ll_csa2_test_all(void); - -#ifdef __cplusplus -} -#endif - -#endif diff --git a/nimble/controller/test/src/ble_ll_csa2_test.c b/nimble/controller/test/src/ble_ll_csa2_test.c index 566500e3..ae8f8897 100644 --- a/nimble/controller/test/src/ble_ll_csa2_test.c +++ b/nimble/controller/test/src/ble_ll_csa2_test.c @@ -17,13 +17,10 @@ * under the License. */ -#include <stddef.h> -#include <string.h> -#include "testutil/testutil.h" -#include "controller/ble_ll_test.h" -#include "controller/ble_ll_conn.h" -#include "controller/ble_ll_utils.h" -#include "ble_ll_csa2_test.h" +#include <stdint.h> +#include <controller/ble_ll_conn.h> +#include <controller/ble_ll_utils.h> +#include <testutil/testutil.h> TEST_CASE_SELF(ble_ll_csa2_test_1) { diff --git a/nimble/controller/test/src/ble_ll_csa2_test.h b/nimble/controller/test/src/ble_ll_csa2_test.h deleted file mode 100644 index 5bcc142b..00000000 --- a/nimble/controller/test/src/ble_ll_csa2_test.h +++ /dev/null @@ -1,27 +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_BLE_LL_CSA2_TEST_ -#define H_BLE_LL_CSA2_TEST_ - -#include "testutil/testutil.h" - -TEST_SUITE_DECL(ble_ll_csa2_test_suite); - -#endif diff --git a/nimble/controller/test/src/ble_ll_test.c b/nimble/controller/test/src/ble_ll_test.c index e496e15f..2b36cb1f 100644 --- a/nimble/controller/test/src/ble_ll_test.c +++ b/nimble/controller/test/src/ble_ll_test.c @@ -17,17 +17,14 @@ * under the License. */ -#include "sysinit/sysinit.h" -#include "syscfg/syscfg.h" -#include "controller/ble_ll_test.h" -#include "os/os.h" -#include "testutil/testutil.h" -#include "ble_ll_csa2_test.h" +#include <syscfg/syscfg.h> +#include <testutil/testutil.h> #if MYNEWT_VAL(SELFTEST) TEST_SUITE_DECL(ble_ll_aa_test_suite); TEST_SUITE_DECL(ble_ll_crypto_test_suite); +TEST_SUITE_DECL(ble_ll_csa2_test_suite); int main(int argc, char **argv) @@ -35,6 +32,7 @@ main(int argc, char **argv) ble_ll_aa_test_suite(); ble_ll_crypto_test_suite(); ble_ll_csa2_test_suite(); + return tu_any_failed; }
