fix(build): fix a link error on macOS

apache · Sep 19, 2023 · fd9bfa1 · fd9bfa1
1 parent 22c9181
commit fd9bfa1
Show file tree

Hide file tree

Showing 39 changed files with 29 additions and 18 deletions.
diff --git a/.gitignore b/.gitignore
@@ -115,7 +115,7 @@ scripts/py_utils/*.pyc
 cmake-build-debug
 packages
 
-src/test/function_test/bulk_load_test/pegasus-bulk-load-function-test-files/
+src/test/function_test/bulk_load/pegasus-bulk-load-function-test-files/
 config-shell.ini.*
 *.tar.gz
 pegasus-server*

diff --git a/run.sh b/run.sh
@@ -437,10 +437,10 @@ function run_test()
     echo "test_modules=$test_modules"
 
     # download bulk load test data
-    if [[ "$test_modules" =~ "bulk_load_test" && ! -d "$ROOT/src/test/function_test/bulk_load_test/pegasus-bulk-load-function-test-files" ]]; then
+    if [[ "$test_modules" =~ "bulk_load_test" && ! -d "$ROOT/src/test/function_test/bulk_load/pegasus-bulk-load-function-test-files" ]]; then
         echo "Start to download files used for bulk load function test"
         wget "https://github.com/XiaoMi/pegasus-common/releases/download/deps/pegasus-bulk-load-function-test-files.zip"
-        unzip "pegasus-bulk-load-function-test-files.zip" -d "$ROOT/src/test/function_test/bulk_load_test"
+        unzip "pegasus-bulk-load-function-test-files.zip" -d "$ROOT/src/test/function_test/bulk_load"
         rm "pegasus-bulk-load-function-test-files.zip"
         echo "Prepare files used for bulk load function test succeed"
     fi
@@ -449,17 +449,26 @@ function run_test()
         echo "====================== run $module =========================="
         # restart onebox when test pegasus
         local need_onebox_tests=(
+          pegasus_geo_test
+          pegasus_rproxy_test
+        )
+        local function_tests=(
           backup_restore_test
           base_api_test
           bulk_load_test
           detect_hotspot_test
           partition_split_test
-          pegasus_geo_test
-          pegasus_rproxy_test
           recovery_test
           restore_test
           throttle_test
         )
+        need_onebox_tests+=(${function_tests[@]})
+        module_dir=${module}
+        if [[ "${function_tests[@]}" =~ "${module}" ]]; then
+          # Remove the "_test" suffix for function tests.
+          suffix="_test"
+          module_dir=${module_dir%"${suffix}"}
+        fi
         if [[ "${need_onebox_tests[@]}" =~ "${module}" ]]; then
             run_clear_onebox
             m_count=3
@@ -484,7 +493,7 @@ function run_test()
             run_stop_zk
             run_start_zk
         fi
-        pushd ${BUILD_LATEST_DIR}/bin/$module
+        pushd ${BUILD_LATEST_DIR}/bin/${module_dir}
         REPORT_DIR=${REPORT_DIR} TEST_BIN=${module} TEST_OPTS=${test_opts} ./run.sh
         if [ $? != 0 ]; then
             echo "run test \"$module\" in `pwd` failed"

diff --git a/src/server/info_collector.h b/src/server/info_collector.h
@@ -19,10 +19,11 @@
 
 #pragma once
 
-// IWYU pragma: no_include <bits/std_abs.h>
 #include <s2/third_party/absl/base/port.h>
 #include <stdint.h>
 #include <stdlib.h>
+// IWYU pragma: no_include <bits/std_abs.h>
+#include <cmath> // IWYU pragma: keep
 #include <map>
 #include <memory>
 #include <string>

diff --git a/src/test/function_test/CMakeLists.txt b/src/test/function_test/CMakeLists.txt
@@ -16,11 +16,11 @@
 # under the License.
 
 add_subdirectory(utils)
-add_subdirectory(backup_restore_test)
-add_subdirectory(base_api_test)
-add_subdirectory(bulk_load_test)
-add_subdirectory(detect_hotspot_test)
-add_subdirectory(partition_split_test)
-add_subdirectory(recovery_test)
-add_subdirectory(restore_test)
-add_subdirectory(throttle_test)
+add_subdirectory(backup_restore)
+add_subdirectory(base_api)
+add_subdirectory(bulk_load)
+add_subdirectory(detect_hotspot)
+add_subdirectory(partition_split)
+add_subdirectory(recovery)
+add_subdirectory(restore)
+add_subdirectory(throttle)
diff --git a/...n_test/backup_restore_test/CMakeLists.txt → ...nction_test/backup_restore/CMakeLists.txt b/...n_test/backup_restore_test/CMakeLists.txt → ...nction_test/backup_restore/CMakeLists.txt
diff --git a/...unction_test/backup_restore_test/main.cpp → ...est/function_test/backup_restore/main.cpp b/...unction_test/backup_restore_test/main.cpp → ...est/function_test/backup_restore/main.cpp
diff --git a/..._restore_test/test_backup_and_restore.cpp → ...ackup_restore/test_backup_and_restore.cpp b/..._restore_test/test_backup_and_restore.cpp → ...ackup_restore/test_backup_and_restore.cpp
diff --git a/...unction_test/base_api_test/CMakeLists.txt → ...est/function_test/base_api/CMakeLists.txt b/...unction_test/base_api_test/CMakeLists.txt → ...est/function_test/base_api/CMakeLists.txt
diff --git a/...n_test/base_api_test/integration_test.cpp → ...nction_test/base_api/integration_test.cpp b/...n_test/base_api_test/integration_test.cpp → ...nction_test/base_api/integration_test.cpp
diff --git a/...test/function_test/base_api_test/main.cpp → src/test/function_test/base_api/main.cpp b/...test/function_test/base_api_test/main.cpp → src/test/function_test/base_api/main.cpp
diff --git a/...unction_test/base_api_test/test_basic.cpp → ...est/function_test/base_api/test_basic.cpp b/...unction_test/base_api_test/test_basic.cpp → ...est/function_test/base_api/test_basic.cpp
diff --git a/...ion_test/base_api_test/test_batch_get.cpp → ...function_test/base_api/test_batch_get.cpp b/...ion_test/base_api_test/test_batch_get.cpp → ...function_test/base_api/test_batch_get.cpp
diff --git a/...t/base_api_test/test_check_and_mutate.cpp → ...n_test/base_api/test_check_and_mutate.cpp b/...t/base_api_test/test_check_and_mutate.cpp → ...n_test/base_api/test_check_and_mutate.cpp
diff --git a/...test/base_api_test/test_check_and_set.cpp → ...tion_test/base_api/test_check_and_set.cpp b/...test/base_api_test/test_check_and_set.cpp → ...tion_test/base_api/test_check_and_set.cpp
diff --git a/...function_test/base_api_test/test_copy.cpp → ...test/function_test/base_api/test_copy.cpp b/...function_test/base_api_test/test_copy.cpp → ...test/function_test/base_api/test_copy.cpp
diff --git a/...function_test/base_api_test/test_incr.cpp → ...test/function_test/base_api/test_incr.cpp b/...function_test/base_api_test/test_incr.cpp → ...test/function_test/base_api/test_incr.cpp
diff --git a/...on_test/base_api_test/test_range_read.cpp → ...unction_test/base_api/test_range_read.cpp b/...on_test/base_api_test/test_range_read.cpp → ...unction_test/base_api/test_range_read.cpp
diff --git a/...nction_test/base_api_test/test_recall.cpp → ...st/function_test/base_api/test_recall.cpp b/...nction_test/base_api_test/test_recall.cpp → ...st/function_test/base_api/test_recall.cpp
diff --git a/...function_test/base_api_test/test_scan.cpp → ...test/function_test/base_api/test_scan.cpp b/...function_test/base_api_test/test_scan.cpp → ...test/function_test/base_api/test_scan.cpp
diff --git a/.../function_test/base_api_test/test_ttl.cpp → src/test/function_test/base_api/test_ttl.cpp b/.../function_test/base_api_test/test_ttl.cpp → src/test/function_test/base_api/test_ttl.cpp
diff --git a/...nction_test/bulk_load_test/CMakeLists.txt → ...st/function_test/bulk_load/CMakeLists.txt b/...nction_test/bulk_load_test/CMakeLists.txt → ...st/function_test/bulk_load/CMakeLists.txt
diff --git a/...est/function_test/bulk_load_test/main.cpp → src/test/function_test/bulk_load/main.cpp b/...est/function_test/bulk_load_test/main.cpp → src/test/function_test/bulk_load/main.cpp
diff --git a/...on_test/bulk_load_test/test_bulk_load.cpp → ...unction_test/bulk_load/test_bulk_load.cpp b/...on_test/bulk_load_test/test_bulk_load.cpp → ...unction_test/bulk_load/test_bulk_load.cpp
@@ -90,7 +90,7 @@ class bulk_load_test : public test_util
         ASSERT_NO_FATAL_FAILURE(
             run_cmd_from_project_root("mkdir -p onebox/block_service/local_service"));
         ASSERT_NO_FATAL_FAILURE(run_cmd_from_project_root(
-            "cp -r src/test/function_test/bulk_load_test/pegasus-bulk-load-function-test-files/" +
+            "cp -r src/test/function_test/bulk_load/pegasus-bulk-load-function-test-files/" +
             LOCAL_ROOT + " onebox/block_service/local_service"));
         string cmd = "echo '{\"app_id\":" + std::to_string(app_id_) +
                      ",\"app_name\":\"temp\",\"partition_count\":8}' > "
@@ -114,7 +114,7 @@ class bulk_load_test : public test_util
     void replace_bulk_load_info()
     {
         string cmd = "cp -R "
-                     "src/test/function_test/bulk_load_test/pegasus-bulk-load-function-test-files/"
+                     "src/test/function_test/bulk_load/pegasus-bulk-load-function-test-files/"
                      "mock_bulk_load_info/. " +
                      bulk_load_local_root_ + "/" + CLUSTER + "/" + app_name_ + "/";
         ASSERT_NO_FATAL_FAILURE(run_cmd_from_project_root(cmd));

diff --git a/...n_test/detect_hotspot_test/CMakeLists.txt → ...nction_test/detect_hotspot/CMakeLists.txt b/...n_test/detect_hotspot_test/CMakeLists.txt → ...nction_test/detect_hotspot/CMakeLists.txt
diff --git a/...unction_test/detect_hotspot_test/main.cpp → ...est/function_test/detect_hotspot/main.cpp b/...unction_test/detect_hotspot_test/main.cpp → ...est/function_test/detect_hotspot/main.cpp
diff --git a/...tect_hotspot_test/test_detect_hotspot.cpp → ...st/detect_hotspot/test_detect_hotspot.cpp b/...tect_hotspot_test/test_detect_hotspot.cpp → ...st/detect_hotspot/test_detect_hotspot.cpp
diff --git a/..._test/partition_split_test/CMakeLists.txt → ...ction_test/partition_split/CMakeLists.txt b/..._test/partition_split_test/CMakeLists.txt → ...ction_test/partition_split/CMakeLists.txt
diff --git a/...nction_test/partition_split_test/main.cpp → ...st/function_test/partition_split/main.cpp b/...nction_test/partition_split_test/main.cpp → ...st/function_test/partition_split/main.cpp
diff --git a/..._test/partition_split_test/test_split.cpp → ...ction_test/partition_split/test_split.cpp b/..._test/partition_split_test/test_split.cpp → ...ction_test/partition_split/test_split.cpp
diff --git a/...unction_test/recovery_test/CMakeLists.txt → ...est/function_test/recovery/CMakeLists.txt b/...unction_test/recovery_test/CMakeLists.txt → ...est/function_test/recovery/CMakeLists.txt
diff --git a/...test/function_test/recovery_test/main.cpp → src/test/function_test/recovery/main.cpp b/...test/function_test/recovery_test/main.cpp → src/test/function_test/recovery/main.cpp
diff --git a/...tion_test/recovery_test/test_recovery.cpp → .../function_test/recovery/test_recovery.cpp b/...tion_test/recovery_test/test_recovery.cpp → .../function_test/recovery/test_recovery.cpp
diff --git a/...function_test/restore_test/CMakeLists.txt → ...test/function_test/restore/CMakeLists.txt b/...function_test/restore_test/CMakeLists.txt → ...test/function_test/restore/CMakeLists.txt
diff --git a/src/test/function_test/restore_test/main.cpp → src/test/function_test/restore/main.cpp b/src/test/function_test/restore_test/main.cpp → src/test/function_test/restore/main.cpp
diff --git a/...nction_test/restore_test/test_restore.cpp → ...st/function_test/restore/test_restore.cpp b/...nction_test/restore_test/test_restore.cpp → ...st/function_test/restore/test_restore.cpp
diff --git a/...unction_test/throttle_test/CMakeLists.txt → ...est/function_test/throttle/CMakeLists.txt b/...unction_test/throttle_test/CMakeLists.txt → ...est/function_test/throttle/CMakeLists.txt
diff --git a/...test/function_test/throttle_test/main.cpp → src/test/function_test/throttle/main.cpp b/...test/function_test/throttle_test/main.cpp → src/test/function_test/throttle/main.cpp
diff --git a/...tion_test/throttle_test/test_throttle.cpp → .../function_test/throttle/test_throttle.cpp b/...tion_test/throttle_test/test_throttle.cpp → .../function_test/throttle/test_throttle.cpp
@@ -131,7 +131,7 @@ struct throttle_test_recorder
 
 // read/write throttle function test
 // the details of records are saved in
-// `./src/builder/test/function_test/throttle_test/throttle_test_result.txt`
+// `./src/builder/test/function_test/throttle/throttle_test_result.txt`
 class throttle_test : public test_util
 {
 public:

diff --git a/src/utils/output_utils.cpp b/src/utils/output_utils.cpp
@@ -17,6 +17,7 @@
 
 #include "utils/output_utils.h"
 
+#include <stdlib.h>
 // IWYU pragma: no_include <ext/alloc_traits.h>
 #include <memory>