From 6e3c9d70079b326888dcceee498a7ec6fb6fa6e4 Mon Sep 17 00:00:00 2001 From: lijincheng Date: Sat, 17 Feb 2024 20:13:24 +0800 Subject: [PATCH] Compilation rectification 1. Exclude "../" include in benchmark test Issue:https://gitee.com/openharmony/commonlibrary_c_utils/issues/I91S1X Signed-off-by: lijincheng --- base/test/benchmarktest/README.md | 4 ++-- base/test/benchmarktest/README_zh.md | 4 ++-- base/test/benchmarktest/ashemem_benchmark_test/BUILD.gn | 4 ++-- .../ashemem_benchmark_test/ashemem_benchmark_test.cpp | 4 ++-- base/test/benchmarktest/{assert.h => benchmark_assert.h} | 0 base/test/benchmarktest/{log.h => benchmark_log.h} | 0 base/test/benchmarktest/datatime_benchmark_test/BUILD.gn | 2 +- .../datatime_benchmark_test/datatime_benchmark_test.cpp | 4 ++-- base/test/benchmarktest/directory_benchmark_test/BUILD.gn | 4 ++-- .../directory_benchmark_test/directory_benchmark_test.cpp | 4 ++-- base/test/benchmarktest/event_benchmark_test/BUILD.gn | 4 ++-- .../event_benchmark_test/event_benchmark_test.cpp | 4 ++-- base/test/benchmarktest/file_benchmark_test/BUILD.gn | 4 ++-- .../benchmarktest/file_benchmark_test/file_benchmark_test.cpp | 4 ++-- base/test/benchmarktest/mapped_benchmark_test/BUILD.gn | 4 ++-- .../mapped_benchmark_test/mapped_benchmark_test.cpp | 4 ++-- base/test/benchmarktest/observer_benchmark_test/BUILD.gn | 4 ++-- .../observer_benchmark_test/observer_benchmark_test.cpp | 4 ++-- base/test/benchmarktest/parcel_benchmark_test/BUILD.gn | 4 ++-- .../parcel_benchmark_test/parcel_benchmark_test.cpp | 4 ++-- base/test/benchmarktest/refbase_benchmark_test/BUILD.gn | 4 ++-- .../refbase_benchmark_test/refbase_benchmark_test.cpp | 4 ++-- base/test/benchmarktest/rwlock_benchmark_test/BUILD.gn | 4 ++-- .../rwlock_benchmark_test/rwlock_benchmark_test.cpp | 4 ++-- .../benchmarktest/safe_block_queue_benchmark_test/BUILD.gn | 4 ++-- .../safe_block_queue_benchmark_test.cpp | 4 ++-- .../safe_block_queue_tracking_benchmark_test/BUILD.gn | 4 ++-- .../safe_block_queue_tracking_benchmark_test.cpp | 4 ++-- base/test/benchmarktest/safe_map_benchmark_test/BUILD.gn | 4 ++-- .../safe_map_benchmark_test/safe_map_benchmark_test.cpp | 4 ++-- base/test/benchmarktest/safe_queue_benchmark_test/BUILD.gn | 4 ++-- .../safe_queue_benchmark_test/safe_queue_benchmark_test.cpp | 4 ++-- base/test/benchmarktest/singleton_benchmark_test/BUILD.gn | 4 ++-- .../singleton_benchmark_test/singleton_benchmark_test.cpp | 4 ++-- base/test/benchmarktest/sorted_vector_benchmark_test/BUILD.gn | 4 ++-- .../sorted_vector_benchmark_test.cpp | 4 ++-- base/test/benchmarktest/string_benchmark_test/BUILD.gn | 4 ++-- .../string_benchmark_test/string_benchmark_test.cpp | 4 ++-- base/test/benchmarktest/thread_benchmark_test/BUILD.gn | 4 ++-- .../thread_benchmark_test/thread_benchmark_test.cpp | 4 ++-- base/test/benchmarktest/thread_pool_benchmark_test/BUILD.gn | 4 ++-- .../thread_pool_benchmark_test/thread_pool_benchmark_test.cpp | 4 ++-- base/test/benchmarktest/timer_benchmark_test/BUILD.gn | 4 ++-- .../timer_benchmark_test/timer_benchmark_test.cpp | 4 ++-- base/test/benchmarktest/unique_fd_benchmark_test/BUILD.gn | 4 ++-- .../unique_fd_benchmark_test/unique_fd_benchmark_test.cpp | 4 ++-- 46 files changed, 87 insertions(+), 87 deletions(-) rename base/test/benchmarktest/{assert.h => benchmark_assert.h} (100%) rename base/test/benchmarktest/{log.h => benchmark_log.h} (100%) diff --git a/base/test/benchmarktest/README.md b/base/test/benchmarktest/README.md index e0bbf16..dde5604 100644 --- a/base/test/benchmarktest/README.md +++ b/base/test/benchmarktest/README.md @@ -33,9 +33,9 @@ commonlibrary/c_utils/base/test │ ├── thread_pool_benchmark_test # threadpool API test │ ├── timer_benchmark_test # timer API test │ ├── unique_fd_benchmark_test # uniquefd API test -│ ├── assert.h +│ ├── benchmark_assert.h │ ├── BUILD.gn -│ └── log.h +│ └── benchmark_log.h ``` ## Build diff --git a/base/test/benchmarktest/README_zh.md b/base/test/benchmarktest/README_zh.md index 7930711..da14ba2 100644 --- a/base/test/benchmarktest/README_zh.md +++ b/base/test/benchmarktest/README_zh.md @@ -30,9 +30,9 @@ commonlibrary/c_utils/base/test │ ├── thread_pool_benchmark_test # 线程池接口性能测试 │ ├── timer_benchmark_test # 定时器接口性能测试 │ ├── unique_fd_benchmark_test # 管理、传递文件描述符接口性能测试 -│ ├── assert.h +│ ├── benchmark_assert.h │ ├── BUILD.gn -│ └── log.h +│ └── benchmark_log.h ``` ## 编译构建 diff --git a/base/test/benchmarktest/ashemem_benchmark_test/BUILD.gn b/base/test/benchmarktest/ashemem_benchmark_test/BUILD.gn index 0e6c174..133bbd5 100644 --- a/base/test/benchmarktest/ashemem_benchmark_test/BUILD.gn +++ b/base/test/benchmarktest/ashemem_benchmark_test/BUILD.gn @@ -9,7 +9,7 @@ # 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. +# limitations under the License. import("//build/test.gni") @@ -17,7 +17,7 @@ module_output_path = "commonlibrary_c_utils/ashemem" ohos_benchmarktest("AshememTest") { module_out_path = module_output_path - + include_dirs = [ "../" ] cflags = [ "-g", "-O0", diff --git a/base/test/benchmarktest/ashemem_benchmark_test/ashemem_benchmark_test.cpp b/base/test/benchmarktest/ashemem_benchmark_test/ashemem_benchmark_test.cpp index 86b42c4..f1585a7 100644 --- a/base/test/benchmarktest/ashemem_benchmark_test/ashemem_benchmark_test.cpp +++ b/base/test/benchmarktest/ashemem_benchmark_test/ashemem_benchmark_test.cpp @@ -24,8 +24,8 @@ #include "parcel.h" #include "refbase.h" #include "ashmem.h" -#include "../log.h" -#include "../assert.h" +#include "benchmark_log.h" +#include "benchmark_assert.h" using namespace std; namespace OHOS { diff --git a/base/test/benchmarktest/assert.h b/base/test/benchmarktest/benchmark_assert.h similarity index 100% rename from base/test/benchmarktest/assert.h rename to base/test/benchmarktest/benchmark_assert.h diff --git a/base/test/benchmarktest/log.h b/base/test/benchmarktest/benchmark_log.h similarity index 100% rename from base/test/benchmarktest/log.h rename to base/test/benchmarktest/benchmark_log.h diff --git a/base/test/benchmarktest/datatime_benchmark_test/BUILD.gn b/base/test/benchmarktest/datatime_benchmark_test/BUILD.gn index 6342a79..a0341d8 100644 --- a/base/test/benchmarktest/datatime_benchmark_test/BUILD.gn +++ b/base/test/benchmarktest/datatime_benchmark_test/BUILD.gn @@ -17,7 +17,7 @@ module_output_path = "commonlibrary_c_utils/datatime" ohos_benchmarktest("DatatimeTest") { module_out_path = module_output_path - + include_dirs = [ "../" ] cflags = [ "-g", "-O0", diff --git a/base/test/benchmarktest/datatime_benchmark_test/datatime_benchmark_test.cpp b/base/test/benchmarktest/datatime_benchmark_test/datatime_benchmark_test.cpp index 5ae547a..2f98a12 100644 --- a/base/test/benchmarktest/datatime_benchmark_test/datatime_benchmark_test.cpp +++ b/base/test/benchmarktest/datatime_benchmark_test/datatime_benchmark_test.cpp @@ -17,8 +17,8 @@ #include "datetime_ex.h" #include #include -#include "../log.h" -#include "../assert.h" +#include "benchmark_log.h" +#include "benchmark_assert.h" using namespace std; namespace OHOS { diff --git a/base/test/benchmarktest/directory_benchmark_test/BUILD.gn b/base/test/benchmarktest/directory_benchmark_test/BUILD.gn index d036d25..8e55741 100644 --- a/base/test/benchmarktest/directory_benchmark_test/BUILD.gn +++ b/base/test/benchmarktest/directory_benchmark_test/BUILD.gn @@ -9,7 +9,7 @@ # 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. +# limitations under the License. import("//build/test.gni") @@ -17,7 +17,7 @@ module_output_path = "commonlibrary_c_utils/directory" ohos_benchmarktest("DirectoryTest") { module_out_path = module_output_path - + include_dirs = [ "../" ] cflags = [ "-g", "-O0", diff --git a/base/test/benchmarktest/directory_benchmark_test/directory_benchmark_test.cpp b/base/test/benchmarktest/directory_benchmark_test/directory_benchmark_test.cpp index 2a06d8f..7a40c95 100644 --- a/base/test/benchmarktest/directory_benchmark_test/directory_benchmark_test.cpp +++ b/base/test/benchmarktest/directory_benchmark_test/directory_benchmark_test.cpp @@ -20,8 +20,8 @@ #include #include #include -#include "../log.h" -#include "../assert.h" +#include "benchmark_log.h" +#include "benchmark_assert.h" using namespace std; namespace OHOS { diff --git a/base/test/benchmarktest/event_benchmark_test/BUILD.gn b/base/test/benchmarktest/event_benchmark_test/BUILD.gn index 9f9a61e..e3fa658 100644 --- a/base/test/benchmarktest/event_benchmark_test/BUILD.gn +++ b/base/test/benchmarktest/event_benchmark_test/BUILD.gn @@ -9,7 +9,7 @@ # 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. +# limitations under the License. import("//build/test.gni") @@ -18,7 +18,7 @@ module_output_path = "commonlibrary_c_utils/event" ohos_benchmarktest("EventTest") { module_out_path = module_output_path - include_dirs = [ "../../../include" ] + include_dirs = [ "../" ] cflags = [ "-g", diff --git a/base/test/benchmarktest/event_benchmark_test/event_benchmark_test.cpp b/base/test/benchmarktest/event_benchmark_test/event_benchmark_test.cpp index 9a1bd3f..d18a018 100644 --- a/base/test/benchmarktest/event_benchmark_test/event_benchmark_test.cpp +++ b/base/test/benchmarktest/event_benchmark_test/event_benchmark_test.cpp @@ -35,8 +35,8 @@ #include "io_event_handler.h" #include "io_event_reactor.h" #include -#include "../log.h" -#include "../assert.h" +#include "benchmark_log.h" +#include "benchmark_assert.h" using namespace OHOS::Utils; namespace OHOS { diff --git a/base/test/benchmarktest/file_benchmark_test/BUILD.gn b/base/test/benchmarktest/file_benchmark_test/BUILD.gn index d9a79e2..06474c4 100644 --- a/base/test/benchmarktest/file_benchmark_test/BUILD.gn +++ b/base/test/benchmarktest/file_benchmark_test/BUILD.gn @@ -9,7 +9,7 @@ # 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. +# limitations under the License. import("//build/test.gni") @@ -17,7 +17,7 @@ module_output_path = "commonlibrary_c_utils/file" ohos_benchmarktest("FileTest") { module_out_path = module_output_path - + include_dirs = [ "../" ] cflags = [ "-g", "-O0", diff --git a/base/test/benchmarktest/file_benchmark_test/file_benchmark_test.cpp b/base/test/benchmarktest/file_benchmark_test/file_benchmark_test.cpp index 462b5c8..5be71bd 100644 --- a/base/test/benchmarktest/file_benchmark_test/file_benchmark_test.cpp +++ b/base/test/benchmarktest/file_benchmark_test/file_benchmark_test.cpp @@ -22,8 +22,8 @@ #include #include #include "file_ex.h" -#include "../log.h" -#include "../assert.h" +#include "benchmark_log.h" +#include "benchmark_assert.h" using namespace std; namespace OHOS { diff --git a/base/test/benchmarktest/mapped_benchmark_test/BUILD.gn b/base/test/benchmarktest/mapped_benchmark_test/BUILD.gn index 4bf564f..93d0054 100644 --- a/base/test/benchmarktest/mapped_benchmark_test/BUILD.gn +++ b/base/test/benchmarktest/mapped_benchmark_test/BUILD.gn @@ -9,7 +9,7 @@ # 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. +# limitations under the License. import("//build/test.gni") @@ -17,7 +17,7 @@ module_output_path = "commonlibrary_c_utils/mapped" ohos_benchmarktest("MappedTest") { module_out_path = module_output_path - + include_dirs = [ "../" ] cflags = [ "-g", "-O0", diff --git a/base/test/benchmarktest/mapped_benchmark_test/mapped_benchmark_test.cpp b/base/test/benchmarktest/mapped_benchmark_test/mapped_benchmark_test.cpp index afe48a0..4ccb923 100644 --- a/base/test/benchmarktest/mapped_benchmark_test/mapped_benchmark_test.cpp +++ b/base/test/benchmarktest/mapped_benchmark_test/mapped_benchmark_test.cpp @@ -23,8 +23,8 @@ #include "directory_ex.h" #include "errors.h" #include "file_ex.h" -#include "../log.h" -#include "../assert.h" +#include "benchmark_log.h" +#include "benchmark_assert.h" using namespace OHOS::Utils; namespace OHOS { diff --git a/base/test/benchmarktest/observer_benchmark_test/BUILD.gn b/base/test/benchmarktest/observer_benchmark_test/BUILD.gn index 11ff6d6..91e0d5c 100644 --- a/base/test/benchmarktest/observer_benchmark_test/BUILD.gn +++ b/base/test/benchmarktest/observer_benchmark_test/BUILD.gn @@ -9,7 +9,7 @@ # 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. +# limitations under the License. import("//build/test.gni") @@ -17,7 +17,7 @@ module_output_path = "commonlibrary_c_utils/observer" ohos_benchmarktest("ObserverTest") { module_out_path = module_output_path - + include_dirs = [ "../" ] cflags = [ "-g", "-O0", diff --git a/base/test/benchmarktest/observer_benchmark_test/observer_benchmark_test.cpp b/base/test/benchmarktest/observer_benchmark_test/observer_benchmark_test.cpp index bc70868..b2cbcb2 100644 --- a/base/test/benchmarktest/observer_benchmark_test/observer_benchmark_test.cpp +++ b/base/test/benchmarktest/observer_benchmark_test/observer_benchmark_test.cpp @@ -18,8 +18,8 @@ #include #include #include -#include "../log.h" -#include "../assert.h" +#include "benchmark_log.h" +#include "benchmark_assert.h" using namespace std; namespace OHOS { diff --git a/base/test/benchmarktest/parcel_benchmark_test/BUILD.gn b/base/test/benchmarktest/parcel_benchmark_test/BUILD.gn index c8d499b..e682790 100644 --- a/base/test/benchmarktest/parcel_benchmark_test/BUILD.gn +++ b/base/test/benchmarktest/parcel_benchmark_test/BUILD.gn @@ -9,7 +9,7 @@ # 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. +# limitations under the License. import("//build/test.gni") @@ -17,7 +17,7 @@ module_output_path = "commonlibrary_c_utils/parcel" ohos_benchmarktest("ParcelTest") { module_out_path = module_output_path - + include_dirs = [ "../" ] cflags = [ "-g", "-O0", diff --git a/base/test/benchmarktest/parcel_benchmark_test/parcel_benchmark_test.cpp b/base/test/benchmarktest/parcel_benchmark_test/parcel_benchmark_test.cpp index 5703d72..4974c60 100644 --- a/base/test/benchmarktest/parcel_benchmark_test/parcel_benchmark_test.cpp +++ b/base/test/benchmarktest/parcel_benchmark_test/parcel_benchmark_test.cpp @@ -21,8 +21,8 @@ #include "parcel.h" #include "refbase.h" #include "securec.h" -#include "../log.h" -#include "../assert.h" +#include "benchmark_log.h" +#include "benchmark_assert.h" using namespace std; namespace OHOS { diff --git a/base/test/benchmarktest/refbase_benchmark_test/BUILD.gn b/base/test/benchmarktest/refbase_benchmark_test/BUILD.gn index e6039f2..bfd7675 100644 --- a/base/test/benchmarktest/refbase_benchmark_test/BUILD.gn +++ b/base/test/benchmarktest/refbase_benchmark_test/BUILD.gn @@ -9,7 +9,7 @@ # 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. +# limitations under the License. import("//build/test.gni") @@ -17,7 +17,7 @@ module_output_path = "commonlibrary_c_utils/refbase" ohos_benchmarktest("RefbaseTest") { module_out_path = module_output_path - + include_dirs = [ "../" ] cflags = [ "-g", "-O0", diff --git a/base/test/benchmarktest/refbase_benchmark_test/refbase_benchmark_test.cpp b/base/test/benchmarktest/refbase_benchmark_test/refbase_benchmark_test.cpp index 1535689..f151d19 100644 --- a/base/test/benchmarktest/refbase_benchmark_test/refbase_benchmark_test.cpp +++ b/base/test/benchmarktest/refbase_benchmark_test/refbase_benchmark_test.cpp @@ -24,8 +24,8 @@ #include #include "refbase.h" #include "singleton.h" -#include "../log.h" -#include "../assert.h" +#include "benchmark_log.h" +#include "benchmark_assert.h" #include using namespace std; diff --git a/base/test/benchmarktest/rwlock_benchmark_test/BUILD.gn b/base/test/benchmarktest/rwlock_benchmark_test/BUILD.gn index c3f9c10..3b90fa6 100644 --- a/base/test/benchmarktest/rwlock_benchmark_test/BUILD.gn +++ b/base/test/benchmarktest/rwlock_benchmark_test/BUILD.gn @@ -9,7 +9,7 @@ # 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. +# limitations under the License. import("//build/test.gni") @@ -17,7 +17,7 @@ module_output_path = "commonlibrary_c_utils/rwlock" ohos_benchmarktest("RwlockTest") { module_out_path = module_output_path - + include_dirs = [ "../" ] cflags = [ "-g", "-O0", diff --git a/base/test/benchmarktest/rwlock_benchmark_test/rwlock_benchmark_test.cpp b/base/test/benchmarktest/rwlock_benchmark_test/rwlock_benchmark_test.cpp index 5d05704..866468d 100644 --- a/base/test/benchmarktest/rwlock_benchmark_test/rwlock_benchmark_test.cpp +++ b/base/test/benchmarktest/rwlock_benchmark_test/rwlock_benchmark_test.cpp @@ -17,8 +17,8 @@ #include #include #include "rwlock.h" -#include "../log.h" -#include "../assert.h" +#include "benchmark_log.h" +#include "benchmark_assert.h" using namespace std; namespace OHOS { diff --git a/base/test/benchmarktest/safe_block_queue_benchmark_test/BUILD.gn b/base/test/benchmarktest/safe_block_queue_benchmark_test/BUILD.gn index 1879597..d75b500 100644 --- a/base/test/benchmarktest/safe_block_queue_benchmark_test/BUILD.gn +++ b/base/test/benchmarktest/safe_block_queue_benchmark_test/BUILD.gn @@ -9,7 +9,7 @@ # 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. +# limitations under the License. import("//build/test.gni") @@ -17,7 +17,7 @@ module_output_path = "commonlibrary_c_utils/safe_block_queue" ohos_benchmarktest("SafeBlockQueueTest") { module_out_path = module_output_path - + include_dirs = [ "../" ] cflags = [ "-g", "-O0", diff --git a/base/test/benchmarktest/safe_block_queue_benchmark_test/safe_block_queue_benchmark_test.cpp b/base/test/benchmarktest/safe_block_queue_benchmark_test/safe_block_queue_benchmark_test.cpp index 5288abf..05a585b 100644 --- a/base/test/benchmarktest/safe_block_queue_benchmark_test/safe_block_queue_benchmark_test.cpp +++ b/base/test/benchmarktest/safe_block_queue_benchmark_test/safe_block_queue_benchmark_test.cpp @@ -21,8 +21,8 @@ #include #include #include -#include "../log.h" -#include "../assert.h" +#include "benchmark_log.h" +#include "benchmark_assert.h" using namespace std; namespace OHOS { diff --git a/base/test/benchmarktest/safe_block_queue_tracking_benchmark_test/BUILD.gn b/base/test/benchmarktest/safe_block_queue_tracking_benchmark_test/BUILD.gn index 8557000..a3348dc 100644 --- a/base/test/benchmarktest/safe_block_queue_tracking_benchmark_test/BUILD.gn +++ b/base/test/benchmarktest/safe_block_queue_tracking_benchmark_test/BUILD.gn @@ -9,7 +9,7 @@ # 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. +# limitations under the License. import("//build/test.gni") @@ -17,7 +17,7 @@ module_output_path = "commonlibrary_c_utils/safe_block_queue_tracking" ohos_benchmarktest("SafeBlockQueueTrackingTest") { module_out_path = module_output_path - + include_dirs = [ "../" ] cflags = [ "-g", "-O0", diff --git a/base/test/benchmarktest/safe_block_queue_tracking_benchmark_test/safe_block_queue_tracking_benchmark_test.cpp b/base/test/benchmarktest/safe_block_queue_tracking_benchmark_test/safe_block_queue_tracking_benchmark_test.cpp index 5b6ecad..a89f26d 100644 --- a/base/test/benchmarktest/safe_block_queue_tracking_benchmark_test/safe_block_queue_tracking_benchmark_test.cpp +++ b/base/test/benchmarktest/safe_block_queue_tracking_benchmark_test/safe_block_queue_tracking_benchmark_test.cpp @@ -20,8 +20,8 @@ #include #include #include -#include "../log.h" -#include "../assert.h" +#include "benchmark_log.h" +#include "benchmark_assert.h" using namespace std; namespace OHOS { diff --git a/base/test/benchmarktest/safe_map_benchmark_test/BUILD.gn b/base/test/benchmarktest/safe_map_benchmark_test/BUILD.gn index a148b5c..813ca88 100644 --- a/base/test/benchmarktest/safe_map_benchmark_test/BUILD.gn +++ b/base/test/benchmarktest/safe_map_benchmark_test/BUILD.gn @@ -9,7 +9,7 @@ # 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. +# limitations under the License. import("//build/test.gni") @@ -17,7 +17,7 @@ module_output_path = "commonlibrary_c_utils/safe_map" ohos_benchmarktest("SafeMapTest") { module_out_path = module_output_path - + include_dirs = [ "../" ] cflags = [ "-g", "-O0", diff --git a/base/test/benchmarktest/safe_map_benchmark_test/safe_map_benchmark_test.cpp b/base/test/benchmarktest/safe_map_benchmark_test/safe_map_benchmark_test.cpp index b3df4bf..e035c1f 100644 --- a/base/test/benchmarktest/safe_map_benchmark_test/safe_map_benchmark_test.cpp +++ b/base/test/benchmarktest/safe_map_benchmark_test/safe_map_benchmark_test.cpp @@ -20,8 +20,8 @@ #include #include #include -#include "../log.h" -#include "../assert.h" +#include "benchmark_log.h" +#include "benchmark_assert.h" using namespace std; using std::chrono::system_clock; diff --git a/base/test/benchmarktest/safe_queue_benchmark_test/BUILD.gn b/base/test/benchmarktest/safe_queue_benchmark_test/BUILD.gn index eaa16e8..36927e9 100644 --- a/base/test/benchmarktest/safe_queue_benchmark_test/BUILD.gn +++ b/base/test/benchmarktest/safe_queue_benchmark_test/BUILD.gn @@ -9,7 +9,7 @@ # 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. +# limitations under the License. import("//build/test.gni") @@ -17,7 +17,7 @@ module_output_path = "commonlibrary_c_utils/safe_queue" ohos_benchmarktest("SafeQueueTest") { module_out_path = module_output_path - + include_dirs = [ "../" ] cflags = [ "-g", "-O0", diff --git a/base/test/benchmarktest/safe_queue_benchmark_test/safe_queue_benchmark_test.cpp b/base/test/benchmarktest/safe_queue_benchmark_test/safe_queue_benchmark_test.cpp index eccd810..a5d39a9 100644 --- a/base/test/benchmarktest/safe_queue_benchmark_test/safe_queue_benchmark_test.cpp +++ b/base/test/benchmarktest/safe_queue_benchmark_test/safe_queue_benchmark_test.cpp @@ -20,8 +20,8 @@ #include #include #include -#include "../log.h" -#include "../assert.h" +#include "benchmark_log.h" +#include "benchmark_assert.h" using namespace std; namespace OHOS { diff --git a/base/test/benchmarktest/singleton_benchmark_test/BUILD.gn b/base/test/benchmarktest/singleton_benchmark_test/BUILD.gn index e1b4d0b..f4f26f2 100644 --- a/base/test/benchmarktest/singleton_benchmark_test/BUILD.gn +++ b/base/test/benchmarktest/singleton_benchmark_test/BUILD.gn @@ -9,7 +9,7 @@ # 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. +# limitations under the License. import("//build/test.gni") @@ -17,7 +17,7 @@ module_output_path = "commonlibrary_c_utils/singleton" ohos_benchmarktest("SingletonTest") { module_out_path = module_output_path - + include_dirs = [ "../" ] cflags = [ "-g", "-O0", diff --git a/base/test/benchmarktest/singleton_benchmark_test/singleton_benchmark_test.cpp b/base/test/benchmarktest/singleton_benchmark_test/singleton_benchmark_test.cpp index dfd89db..e82aec9 100644 --- a/base/test/benchmarktest/singleton_benchmark_test/singleton_benchmark_test.cpp +++ b/base/test/benchmarktest/singleton_benchmark_test/singleton_benchmark_test.cpp @@ -18,8 +18,8 @@ #include #include #include -#include "../log.h" -#include "../assert.h" +#include "benchmark_log.h" +#include "benchmark_assert.h" using namespace std; namespace OHOS { diff --git a/base/test/benchmarktest/sorted_vector_benchmark_test/BUILD.gn b/base/test/benchmarktest/sorted_vector_benchmark_test/BUILD.gn index e7e5ba6..bb5b94f 100644 --- a/base/test/benchmarktest/sorted_vector_benchmark_test/BUILD.gn +++ b/base/test/benchmarktest/sorted_vector_benchmark_test/BUILD.gn @@ -9,7 +9,7 @@ # 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. +# limitations under the License. import("//build/test.gni") @@ -17,7 +17,7 @@ module_output_path = "commonlibrary_c_utils/sorted_vector" ohos_benchmarktest("SortedVectorTest") { module_out_path = module_output_path - + include_dirs = [ "../" ] cflags = [ "-g", "-O0", diff --git a/base/test/benchmarktest/sorted_vector_benchmark_test/sorted_vector_benchmark_test.cpp b/base/test/benchmarktest/sorted_vector_benchmark_test/sorted_vector_benchmark_test.cpp index c65ba2d..9acb6d1 100644 --- a/base/test/benchmarktest/sorted_vector_benchmark_test/sorted_vector_benchmark_test.cpp +++ b/base/test/benchmarktest/sorted_vector_benchmark_test/sorted_vector_benchmark_test.cpp @@ -16,8 +16,8 @@ #include #include "sorted_vector.h" #include -#include "../log.h" -#include "../assert.h" +#include "benchmark_log.h" +#include "benchmark_assert.h" using namespace std; namespace OHOS { diff --git a/base/test/benchmarktest/string_benchmark_test/BUILD.gn b/base/test/benchmarktest/string_benchmark_test/BUILD.gn index 86c2894..a8d7857 100644 --- a/base/test/benchmarktest/string_benchmark_test/BUILD.gn +++ b/base/test/benchmarktest/string_benchmark_test/BUILD.gn @@ -9,7 +9,7 @@ # 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. +# limitations under the License. import("//build/test.gni") @@ -17,7 +17,7 @@ module_output_path = "commonlibrary_c_utils/string" ohos_benchmarktest("StringTest") { module_out_path = module_output_path - + include_dirs = [ "../" ] cflags = [ "-g", "-O0", diff --git a/base/test/benchmarktest/string_benchmark_test/string_benchmark_test.cpp b/base/test/benchmarktest/string_benchmark_test/string_benchmark_test.cpp index a236490..7038951 100644 --- a/base/test/benchmarktest/string_benchmark_test/string_benchmark_test.cpp +++ b/base/test/benchmarktest/string_benchmark_test/string_benchmark_test.cpp @@ -16,8 +16,8 @@ #include #include "string_ex.h" #include -#include "../log.h" -#include "../assert.h" +#include "benchmark_log.h" +#include "benchmark_assert.h" using namespace std; namespace OHOS { diff --git a/base/test/benchmarktest/thread_benchmark_test/BUILD.gn b/base/test/benchmarktest/thread_benchmark_test/BUILD.gn index 93a1806..a564db2 100644 --- a/base/test/benchmarktest/thread_benchmark_test/BUILD.gn +++ b/base/test/benchmarktest/thread_benchmark_test/BUILD.gn @@ -9,7 +9,7 @@ # 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. +# limitations under the License. import("//build/test.gni") @@ -17,7 +17,7 @@ module_output_path = "commonlibrary_c_utils/thread" ohos_benchmarktest("ThreadTest") { module_out_path = module_output_path - + include_dirs = [ "../" ] cflags = [ "-g", "-O0", diff --git a/base/test/benchmarktest/thread_benchmark_test/thread_benchmark_test.cpp b/base/test/benchmarktest/thread_benchmark_test/thread_benchmark_test.cpp index c273fc7..68a9a3f 100644 --- a/base/test/benchmarktest/thread_benchmark_test/thread_benchmark_test.cpp +++ b/base/test/benchmarktest/thread_benchmark_test/thread_benchmark_test.cpp @@ -20,8 +20,8 @@ #include #include #include -#include "../log.h" -#include "../assert.h" +#include "benchmark_log.h" +#include "benchmark_assert.h" using namespace std; namespace OHOS { diff --git a/base/test/benchmarktest/thread_pool_benchmark_test/BUILD.gn b/base/test/benchmarktest/thread_pool_benchmark_test/BUILD.gn index 475ef62..1e162be 100644 --- a/base/test/benchmarktest/thread_pool_benchmark_test/BUILD.gn +++ b/base/test/benchmarktest/thread_pool_benchmark_test/BUILD.gn @@ -9,7 +9,7 @@ # 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. +# limitations under the License. import("//build/test.gni") @@ -17,7 +17,7 @@ module_output_path = "commonlibrary_c_utils/thread_pool" ohos_benchmarktest("ThreadPoolTest") { module_out_path = module_output_path - + include_dirs = [ "../" ] cflags = [ "-g", "-O0", diff --git a/base/test/benchmarktest/thread_pool_benchmark_test/thread_pool_benchmark_test.cpp b/base/test/benchmarktest/thread_pool_benchmark_test/thread_pool_benchmark_test.cpp index cecb290..49ae526 100644 --- a/base/test/benchmarktest/thread_pool_benchmark_test/thread_pool_benchmark_test.cpp +++ b/base/test/benchmarktest/thread_pool_benchmark_test/thread_pool_benchmark_test.cpp @@ -18,8 +18,8 @@ #include #include #include "thread_pool.h" -#include "../log.h" -#include "../assert.h" +#include "benchmark_log.h" +#include "benchmark_assert.h" #include namespace OHOS { diff --git a/base/test/benchmarktest/timer_benchmark_test/BUILD.gn b/base/test/benchmarktest/timer_benchmark_test/BUILD.gn index 9827552..d7377a3 100644 --- a/base/test/benchmarktest/timer_benchmark_test/BUILD.gn +++ b/base/test/benchmarktest/timer_benchmark_test/BUILD.gn @@ -9,7 +9,7 @@ # 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. +# limitations under the License. import("//build/test.gni") @@ -17,7 +17,7 @@ module_output_path = "commonlibrary_c_utils/timer" ohos_benchmarktest("TimerTest") { module_out_path = module_output_path - + include_dirs = [ "../" ] cflags = [ "-g", "-O0", diff --git a/base/test/benchmarktest/timer_benchmark_test/timer_benchmark_test.cpp b/base/test/benchmarktest/timer_benchmark_test/timer_benchmark_test.cpp index 64b8b3f..d69b649 100644 --- a/base/test/benchmarktest/timer_benchmark_test/timer_benchmark_test.cpp +++ b/base/test/benchmarktest/timer_benchmark_test/timer_benchmark_test.cpp @@ -21,8 +21,8 @@ #include #include #include -#include "../log.h" -#include "../assert.h" +#include "benchmark_log.h" +#include "benchmark_assert.h" using namespace std; namespace OHOS { diff --git a/base/test/benchmarktest/unique_fd_benchmark_test/BUILD.gn b/base/test/benchmarktest/unique_fd_benchmark_test/BUILD.gn index 72499d1..a35972b 100644 --- a/base/test/benchmarktest/unique_fd_benchmark_test/BUILD.gn +++ b/base/test/benchmarktest/unique_fd_benchmark_test/BUILD.gn @@ -9,7 +9,7 @@ # 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. +# limitations under the License. import("//build/test.gni") @@ -17,7 +17,7 @@ module_output_path = "commonlibrary_c_utils/unique_fd" ohos_benchmarktest("UniqueFdTest") { module_out_path = module_output_path - + include_dirs = [ "../" ] cflags = [ "-g", "-O0", diff --git a/base/test/benchmarktest/unique_fd_benchmark_test/unique_fd_benchmark_test.cpp b/base/test/benchmarktest/unique_fd_benchmark_test/unique_fd_benchmark_test.cpp index b3f66b8..7c02399 100644 --- a/base/test/benchmarktest/unique_fd_benchmark_test/unique_fd_benchmark_test.cpp +++ b/base/test/benchmarktest/unique_fd_benchmark_test/unique_fd_benchmark_test.cpp @@ -20,8 +20,8 @@ #include #include #include -#include "../log.h" -#include "../assert.h" +#include "benchmark_log.h" +#include "benchmark_assert.h" using namespace std; namespace OHOS { -- Gitee