summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Michelle Yang <micya@google.com> 2023-05-25 16:03:22 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-05-25 16:03:22 +0000
commit73f17dc976e06d7c1b2d708dd1936ea526a577ed (patch)
treec7aef909f606776461adff6b4d73250b00fe6263
parent7a4134f30804791cee71c99876162b4a1f030bd6 (diff)
parent2e2a114d4a1256cea0604d7ef02cd215c4d90117 (diff)
Merge "Revert "Adding host script to run test fuzzer."" am: 2e2a114d4a
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2605625 Change-Id: I9a973e16f4fb7d741e6a1c2b23ccbfb2bf7dc55c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--libs/binder/tests/parcel_fuzzer/test_fuzzer/Android.bp13
-rw-r--r--libs/binder/tests/parcel_fuzzer/test_fuzzer/fuzz_service_test_config.xml22
-rw-r--r--libs/binder/tests/parcel_fuzzer/test_fuzzer/run_fuzz_service_test.sh42
3 files changed, 0 insertions, 77 deletions
diff --git a/libs/binder/tests/parcel_fuzzer/test_fuzzer/Android.bp b/libs/binder/tests/parcel_fuzzer/test_fuzzer/Android.bp
index e60ca22497..28da285128 100644
--- a/libs/binder/tests/parcel_fuzzer/test_fuzzer/Android.bp
+++ b/libs/binder/tests/parcel_fuzzer/test_fuzzer/Android.bp
@@ -40,16 +40,3 @@ cc_fuzz {
fuzz_on_haiku_device: false,
},
}
-
-sh_test_host {
- name: "fuzz_service_test",
- src: "run_fuzz_service_test.sh",
- filename: "run_fuzz_service_test.sh",
- test_config: "fuzz_service_test_config.xml",
- data_bins: [
- "test_service_fuzzer_should_crash",
- ],
- required: [
- "test_service_fuzzer_should_crash",
- ],
-}
diff --git a/libs/binder/tests/parcel_fuzzer/test_fuzzer/fuzz_service_test_config.xml b/libs/binder/tests/parcel_fuzzer/test_fuzzer/fuzz_service_test_config.xml
deleted file mode 100644
index 19eb33a635..0000000000
--- a/libs/binder/tests/parcel_fuzzer/test_fuzzer/fuzz_service_test_config.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2023 The Android Open Source Project
-
- Licensed 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.
--->
-<configuration description="Runs fuzzService test">
- <option name="null-device" value="true" />
- <test class="com.android.tradefed.testtype.binary.ExecutableHostTest" >
- <option name="binary" value="run_fuzz_service_test.sh"/>
- <option name="relative-path-execution" value="true" />
- </test>
-</configuration>
diff --git a/libs/binder/tests/parcel_fuzzer/test_fuzzer/run_fuzz_service_test.sh b/libs/binder/tests/parcel_fuzzer/test_fuzzer/run_fuzz_service_test.sh
deleted file mode 100644
index cec52fd6e7..0000000000
--- a/libs/binder/tests/parcel_fuzzer/test_fuzzer/run_fuzz_service_test.sh
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/bin/bash
-# Copyright (C) 2023 The Android Open Source Project
-#
-# Licensed 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.
-
-color_success=$'\E'"[0;32m"
-color_failed=$'\E'"[0;31m"
-color_reset=$'\E'"[00m"
-
-FUZZER_NAME=test_service_fuzzer_should_crash
-FUZZER_OUT=fuzzer-output
-
-if [ ! -f "$FUZZER_NAME" ]
-then
- echo -e "${color_failed}Binary $FUZZER_NAME does not exist"
- echo "${color_reset}"
- exit 1
-fi
-
-echo "INFO: Running fuzzer : test_service_fuzzer_should_crash"
-
-./test_service_fuzzer_should_crash -max_total_time=30 &>${FUZZER_OUT}
-
-echo "INFO: Searching fuzzer output for expected crashes"
-if grep -q "Expected crash in set" ${FUZZER_OUT};
-then
- echo -e "${color_success}Success: Found expected crash. fuzzService test successful!"
-else
- echo -e "${color_failed}Failed: Unable to find successful fuzzing output from test_service_fuzzer_should_crash"
- echo "${color_reset}"
- exit 1
-fi