From d642aedb295e057e35a7effbc331b026727ad7d8 Mon Sep 17 00:00:00 2001 From: lixiangpeng5 Date: Wed, 13 Sep 2023 09:45:50 +0000 Subject: [PATCH] fix fuzz out path Signed-off-by: lixiangpeng5 Change-Id: I8ae0ce097cfb79b63ec0367471d9069e4144d0a7 --- .../native/test/fuzztest/getactivesensorinfos_fuzzer/BUILD.gn | 2 +- interfaces/native/test/fuzztest/register_fuzzer/BUILD.gn | 2 +- interfaces/native/test/fuzztest/resumesensors_fuzzer/BUILD.gn | 2 +- interfaces/native/test/fuzztest/sensoragent_fuzzer/BUILD.gn | 2 +- interfaces/native/test/fuzztest/suspendsensors_fuzzer/BUILD.gn | 2 +- interfaces/native/test/fuzztest/unregister_fuzzer/BUILD.gn | 2 +- sensor.gni | 2 ++ .../sensor/test/fuzztest/createdatachannelstub_fuzzer/BUILD.gn | 2 +- .../test/fuzztest/createsocketchannelstub_fuzzer/BUILD.gn | 2 +- .../sensor/test/fuzztest/destroydatachannelstub_fuzzer/BUILD.gn | 2 +- .../test/fuzztest/destroysocketchannelstub_fuzzer/BUILD.gn | 2 +- .../test/fuzztest/disableactiveinfocbstub_fuzzer/BUILD.gn | 2 +- .../sensor/test/fuzztest/enableactiveinfocbstub_fuzzer/BUILD.gn | 2 +- .../sensor/test/fuzztest/getactiveinfoliststub_fuzzer/BUILD.gn | 2 +- services/sensor/test/fuzztest/getallsensorsstub_fuzzer/BUILD.gn | 2 +- services/sensor/test/fuzztest/resetsensorsstub_fuzzer/BUILD.gn | 2 +- services/sensor/test/fuzztest/resumesensorsstub_fuzzer/BUILD.gn | 2 +- services/sensor/test/fuzztest/sensordisablestub_fuzzer/BUILD.gn | 2 +- services/sensor/test/fuzztest/sensorenablestub_fuzzer/BUILD.gn | 2 +- .../sensor/test/fuzztest/sensoronremoterequest_fuzzer/BUILD.gn | 2 +- .../sensor/test/fuzztest/suspendsensorsstub_fuzzer/BUILD.gn | 2 +- 21 files changed, 22 insertions(+), 20 deletions(-) diff --git a/interfaces/native/test/fuzztest/getactivesensorinfos_fuzzer/BUILD.gn b/interfaces/native/test/fuzztest/getactivesensorinfos_fuzzer/BUILD.gn index bcfe69e2..35d43c1d 100644 --- a/interfaces/native/test/fuzztest/getactivesensorinfos_fuzzer/BUILD.gn +++ b/interfaces/native/test/fuzztest/getactivesensorinfos_fuzzer/BUILD.gn @@ -17,7 +17,7 @@ import("//build/test.gni") import("./../../../../../sensor.gni") ohos_fuzztest("GetActiveSensorInfosFuzzTest") { - module_out_path = "sensors/sensor" + module_out_path = FUZZ_MODULE_OUT_PATH fuzz_config_file = "$SUBSYSTEM_DIR/interfaces/native/test/fuzztest/getactivesensorinfos_fuzzer" diff --git a/interfaces/native/test/fuzztest/register_fuzzer/BUILD.gn b/interfaces/native/test/fuzztest/register_fuzzer/BUILD.gn index dfa72870..136c1355 100644 --- a/interfaces/native/test/fuzztest/register_fuzzer/BUILD.gn +++ b/interfaces/native/test/fuzztest/register_fuzzer/BUILD.gn @@ -17,7 +17,7 @@ import("//build/test.gni") import("./../../../../../sensor.gni") ohos_fuzztest("RegisterFuzzTest") { - module_out_path = "sensors/sensor" + module_out_path = FUZZ_MODULE_OUT_PATH fuzz_config_file = "$SUBSYSTEM_DIR/interfaces/native/test/fuzztest/register_fuzzer" diff --git a/interfaces/native/test/fuzztest/resumesensors_fuzzer/BUILD.gn b/interfaces/native/test/fuzztest/resumesensors_fuzzer/BUILD.gn index 37404195..fd6a1282 100644 --- a/interfaces/native/test/fuzztest/resumesensors_fuzzer/BUILD.gn +++ b/interfaces/native/test/fuzztest/resumesensors_fuzzer/BUILD.gn @@ -17,7 +17,7 @@ import("//build/test.gni") import("./../../../../../sensor.gni") ohos_fuzztest("ResumeSensorsFuzzTest") { - module_out_path = "sensors/sensor" + module_out_path = FUZZ_MODULE_OUT_PATH fuzz_config_file = "$SUBSYSTEM_DIR/interfaces/native/test/fuzztest/resumesensors_fuzzer" diff --git a/interfaces/native/test/fuzztest/sensoragent_fuzzer/BUILD.gn b/interfaces/native/test/fuzztest/sensoragent_fuzzer/BUILD.gn index 412b45dd..218e70a4 100644 --- a/interfaces/native/test/fuzztest/sensoragent_fuzzer/BUILD.gn +++ b/interfaces/native/test/fuzztest/sensoragent_fuzzer/BUILD.gn @@ -17,7 +17,7 @@ import("//build/test.gni") import("./../../../../../sensor.gni") ohos_fuzztest("SensorAgentFuzzTest") { - module_out_path = "sensors/sensor" + module_out_path = FUZZ_MODULE_OUT_PATH fuzz_config_file = "$SUBSYSTEM_DIR/interfaces/native/test/fuzztest/sensoragent_fuzzer" diff --git a/interfaces/native/test/fuzztest/suspendsensors_fuzzer/BUILD.gn b/interfaces/native/test/fuzztest/suspendsensors_fuzzer/BUILD.gn index b413f88b..4a642de8 100644 --- a/interfaces/native/test/fuzztest/suspendsensors_fuzzer/BUILD.gn +++ b/interfaces/native/test/fuzztest/suspendsensors_fuzzer/BUILD.gn @@ -17,7 +17,7 @@ import("//build/test.gni") import("./../../../../../sensor.gni") ohos_fuzztest("SuspendSensorsFuzzTest") { - module_out_path = "sensors/sensor" + module_out_path = FUZZ_MODULE_OUT_PATH fuzz_config_file = "$SUBSYSTEM_DIR/interfaces/native/test/fuzztest/suspendsensors_fuzzer" diff --git a/interfaces/native/test/fuzztest/unregister_fuzzer/BUILD.gn b/interfaces/native/test/fuzztest/unregister_fuzzer/BUILD.gn index c311c5e2..e338c482 100644 --- a/interfaces/native/test/fuzztest/unregister_fuzzer/BUILD.gn +++ b/interfaces/native/test/fuzztest/unregister_fuzzer/BUILD.gn @@ -17,7 +17,7 @@ import("//build/test.gni") import("./../../../../../sensor.gni") ohos_fuzztest("UnregisterFuzzTest") { - module_out_path = "sensors/sensor" + module_out_path = FUZZ_MODULE_OUT_PATH fuzz_config_file = "$SUBSYSTEM_DIR/interfaces/native/test/fuzztest/unregister_fuzzer" diff --git a/sensor.gni b/sensor.gni index 8e81a7e4..e95f6dcb 100644 --- a/sensor.gni +++ b/sensor.gni @@ -19,6 +19,8 @@ declare_args() { SUBSYSTEM_DIR = "//base/sensors/sensor" +FUZZ_MODULE_OUT_PATH = "sensor/sensor" + sensor_default_defines = [] if (rust_socket_ipc) { diff --git a/services/sensor/test/fuzztest/createdatachannelstub_fuzzer/BUILD.gn b/services/sensor/test/fuzztest/createdatachannelstub_fuzzer/BUILD.gn index c0c2c006..ffd8bad6 100644 --- a/services/sensor/test/fuzztest/createdatachannelstub_fuzzer/BUILD.gn +++ b/services/sensor/test/fuzztest/createdatachannelstub_fuzzer/BUILD.gn @@ -17,7 +17,7 @@ import("//build/test.gni") import("./../../../../../sensor.gni") ohos_fuzztest("CreateDataChannelStubFuzzTest") { - module_out_path = "sensors/sensor" + module_out_path = FUZZ_MODULE_OUT_PATH fuzz_config_file = "$SUBSYSTEM_DIR/services/sensor/test/fuzztest/createdatachannelstub_fuzzer" diff --git a/services/sensor/test/fuzztest/createsocketchannelstub_fuzzer/BUILD.gn b/services/sensor/test/fuzztest/createsocketchannelstub_fuzzer/BUILD.gn index b75897f2..47954426 100644 --- a/services/sensor/test/fuzztest/createsocketchannelstub_fuzzer/BUILD.gn +++ b/services/sensor/test/fuzztest/createsocketchannelstub_fuzzer/BUILD.gn @@ -17,7 +17,7 @@ import("//build/test.gni") import("./../../../../../sensor.gni") ohos_fuzztest("CreateSocketChannelStubFuzzTest") { - module_out_path = "sensors/sensor" + module_out_path = FUZZ_MODULE_OUT_PATH fuzz_config_file = "$SUBSYSTEM_DIR/services/sensor/test/fuzztest/createsocketchannelstub_fuzzer" diff --git a/services/sensor/test/fuzztest/destroydatachannelstub_fuzzer/BUILD.gn b/services/sensor/test/fuzztest/destroydatachannelstub_fuzzer/BUILD.gn index 5cabd381..dc856996 100644 --- a/services/sensor/test/fuzztest/destroydatachannelstub_fuzzer/BUILD.gn +++ b/services/sensor/test/fuzztest/destroydatachannelstub_fuzzer/BUILD.gn @@ -17,7 +17,7 @@ import("//build/test.gni") import("./../../../../../sensor.gni") ohos_fuzztest("DestroyDataChannelStubFuzzTest") { - module_out_path = "sensors/sensor" + module_out_path = FUZZ_MODULE_OUT_PATH fuzz_config_file = "$SUBSYSTEM_DIR/services/sensor/test/fuzztest/destroydatachannelstub_fuzzer" diff --git a/services/sensor/test/fuzztest/destroysocketchannelstub_fuzzer/BUILD.gn b/services/sensor/test/fuzztest/destroysocketchannelstub_fuzzer/BUILD.gn index 5dbfc5f3..185ba2c3 100644 --- a/services/sensor/test/fuzztest/destroysocketchannelstub_fuzzer/BUILD.gn +++ b/services/sensor/test/fuzztest/destroysocketchannelstub_fuzzer/BUILD.gn @@ -17,7 +17,7 @@ import("//build/test.gni") import("./../../../../../sensor.gni") ohos_fuzztest("DestroySocketChannelStubFuzzTest") { - module_out_path = "sensors/sensor" + module_out_path = FUZZ_MODULE_OUT_PATH fuzz_config_file = "$SUBSYSTEM_DIR/services/sensor/test/fuzztest/destroysocketchannelstub_fuzzer" diff --git a/services/sensor/test/fuzztest/disableactiveinfocbstub_fuzzer/BUILD.gn b/services/sensor/test/fuzztest/disableactiveinfocbstub_fuzzer/BUILD.gn index 0f834eef..f17f8f57 100644 --- a/services/sensor/test/fuzztest/disableactiveinfocbstub_fuzzer/BUILD.gn +++ b/services/sensor/test/fuzztest/disableactiveinfocbstub_fuzzer/BUILD.gn @@ -17,7 +17,7 @@ import("//build/test.gni") import("./../../../../../sensor.gni") ohos_fuzztest("DisableActiveInfoCBStubFuzzTest") { - module_out_path = "sensors/sensor" + module_out_path = FUZZ_MODULE_OUT_PATH fuzz_config_file = "$SUBSYSTEM_DIR/services/sensor/test/fuzztest/disableactiveinfocbstub_fuzzer" diff --git a/services/sensor/test/fuzztest/enableactiveinfocbstub_fuzzer/BUILD.gn b/services/sensor/test/fuzztest/enableactiveinfocbstub_fuzzer/BUILD.gn index a916bb3a..d2613b09 100644 --- a/services/sensor/test/fuzztest/enableactiveinfocbstub_fuzzer/BUILD.gn +++ b/services/sensor/test/fuzztest/enableactiveinfocbstub_fuzzer/BUILD.gn @@ -17,7 +17,7 @@ import("//build/test.gni") import("./../../../../../sensor.gni") ohos_fuzztest("EnableActiveInfoCBStubFuzzTest") { - module_out_path = "sensors/sensor" + module_out_path = FUZZ_MODULE_OUT_PATH fuzz_config_file = "$SUBSYSTEM_DIR/services/sensor/test/fuzztest/enableactiveinfocbstub_fuzzer" diff --git a/services/sensor/test/fuzztest/getactiveinfoliststub_fuzzer/BUILD.gn b/services/sensor/test/fuzztest/getactiveinfoliststub_fuzzer/BUILD.gn index cac26569..2542338f 100644 --- a/services/sensor/test/fuzztest/getactiveinfoliststub_fuzzer/BUILD.gn +++ b/services/sensor/test/fuzztest/getactiveinfoliststub_fuzzer/BUILD.gn @@ -17,7 +17,7 @@ import("//build/test.gni") import("./../../../../../sensor.gni") ohos_fuzztest("GetActiveInfoListStubFuzzTest") { - module_out_path = "sensors/sensor" + module_out_path = FUZZ_MODULE_OUT_PATH fuzz_config_file = "$SUBSYSTEM_DIR/services/sensor/test/fuzztest/getactiveinfoliststub_fuzzer" diff --git a/services/sensor/test/fuzztest/getallsensorsstub_fuzzer/BUILD.gn b/services/sensor/test/fuzztest/getallsensorsstub_fuzzer/BUILD.gn index cf2aa5ee..89437be6 100644 --- a/services/sensor/test/fuzztest/getallsensorsstub_fuzzer/BUILD.gn +++ b/services/sensor/test/fuzztest/getallsensorsstub_fuzzer/BUILD.gn @@ -17,7 +17,7 @@ import("//build/test.gni") import("./../../../../../sensor.gni") ohos_fuzztest("GetAllSensorsStubFuzzTest") { - module_out_path = "sensors/sensor" + module_out_path = FUZZ_MODULE_OUT_PATH fuzz_config_file = "$SUBSYSTEM_DIR/services/sensor/test/fuzztest/getallsensorsstub_fuzzer" diff --git a/services/sensor/test/fuzztest/resetsensorsstub_fuzzer/BUILD.gn b/services/sensor/test/fuzztest/resetsensorsstub_fuzzer/BUILD.gn index a05c3446..b5a89a1b 100644 --- a/services/sensor/test/fuzztest/resetsensorsstub_fuzzer/BUILD.gn +++ b/services/sensor/test/fuzztest/resetsensorsstub_fuzzer/BUILD.gn @@ -17,7 +17,7 @@ import("//build/test.gni") import("./../../../../../sensor.gni") ohos_fuzztest("ResetSensorsStubFuzzTest") { - module_out_path = "sensors/sensor" + module_out_path = FUZZ_MODULE_OUT_PATH fuzz_config_file = "$SUBSYSTEM_DIR/services/sensor/test/fuzztest/resetsensorsstub_fuzzer" diff --git a/services/sensor/test/fuzztest/resumesensorsstub_fuzzer/BUILD.gn b/services/sensor/test/fuzztest/resumesensorsstub_fuzzer/BUILD.gn index 54aacac5..9b0cd78a 100644 --- a/services/sensor/test/fuzztest/resumesensorsstub_fuzzer/BUILD.gn +++ b/services/sensor/test/fuzztest/resumesensorsstub_fuzzer/BUILD.gn @@ -17,7 +17,7 @@ import("//build/test.gni") import("./../../../../../sensor.gni") ohos_fuzztest("ResumeSensorsStubFuzzTest") { - module_out_path = "sensors/sensor" + module_out_path = FUZZ_MODULE_OUT_PATH fuzz_config_file = "$SUBSYSTEM_DIR/services/sensor/test/fuzztest/resumesensorsstub_fuzzer" diff --git a/services/sensor/test/fuzztest/sensordisablestub_fuzzer/BUILD.gn b/services/sensor/test/fuzztest/sensordisablestub_fuzzer/BUILD.gn index 93ec8273..8c01778b 100644 --- a/services/sensor/test/fuzztest/sensordisablestub_fuzzer/BUILD.gn +++ b/services/sensor/test/fuzztest/sensordisablestub_fuzzer/BUILD.gn @@ -17,7 +17,7 @@ import("//build/test.gni") import("./../../../../../sensor.gni") ohos_fuzztest("SensorDisableStubFuzzTest") { - module_out_path = "sensors/sensor" + module_out_path = FUZZ_MODULE_OUT_PATH fuzz_config_file = "$SUBSYSTEM_DIR/services/sensor/test/fuzztest/sensordisablestub_fuzzer" diff --git a/services/sensor/test/fuzztest/sensorenablestub_fuzzer/BUILD.gn b/services/sensor/test/fuzztest/sensorenablestub_fuzzer/BUILD.gn index f8e924e5..ce98b8de 100644 --- a/services/sensor/test/fuzztest/sensorenablestub_fuzzer/BUILD.gn +++ b/services/sensor/test/fuzztest/sensorenablestub_fuzzer/BUILD.gn @@ -17,7 +17,7 @@ import("//build/test.gni") import("./../../../../../sensor.gni") ohos_fuzztest("SensorEnableStubFuzzTest") { - module_out_path = "sensors/sensor" + module_out_path = FUZZ_MODULE_OUT_PATH fuzz_config_file = "$SUBSYSTEM_DIR/services/sensor/test/fuzztest/sensorenablestub_fuzzer" diff --git a/services/sensor/test/fuzztest/sensoronremoterequest_fuzzer/BUILD.gn b/services/sensor/test/fuzztest/sensoronremoterequest_fuzzer/BUILD.gn index 392628c1..7dc01e91 100644 --- a/services/sensor/test/fuzztest/sensoronremoterequest_fuzzer/BUILD.gn +++ b/services/sensor/test/fuzztest/sensoronremoterequest_fuzzer/BUILD.gn @@ -17,7 +17,7 @@ import("//build/test.gni") import("./../../../../../sensor.gni") ohos_fuzztest("SensorOnRemoteRequestFuzzTest") { - module_out_path = "sensors/sensor" + module_out_path = FUZZ_MODULE_OUT_PATH fuzz_config_file = "$SUBSYSTEM_DIR/services/sensor/test/fuzztest/sensoronremoterequest_fuzzer" diff --git a/services/sensor/test/fuzztest/suspendsensorsstub_fuzzer/BUILD.gn b/services/sensor/test/fuzztest/suspendsensorsstub_fuzzer/BUILD.gn index d41479e8..eb249eee 100644 --- a/services/sensor/test/fuzztest/suspendsensorsstub_fuzzer/BUILD.gn +++ b/services/sensor/test/fuzztest/suspendsensorsstub_fuzzer/BUILD.gn @@ -17,7 +17,7 @@ import("//build/test.gni") import("./../../../../../sensor.gni") ohos_fuzztest("SuspendSensorsStubFuzzTest") { - module_out_path = "sensors/sensor" + module_out_path = FUZZ_MODULE_OUT_PATH fuzz_config_file = "$SUBSYSTEM_DIR/services/sensor/test/fuzztest/suspendsensorsstub_fuzzer" -- Gitee