Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2b7e126e authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge changes I252f3b20,I0bfff9b4 am: 754efd77 

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2601667



Change-Id: Ia3bd93400669e1a6fb63d65f5d334d3177292e4c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 6397f4d3 754efd77

libs/binder/TEST_MAPPING

+3 −0
Original line number Diff line number Diff line
@@ -63,6 +63,9 @@ 
    {

      "name": "libbinderthreadstateutils_test"

    },

    {

      "name": "fuzz_service_test"

    },

    {

      "name": "CtsOsTestCases",

      "options": [

libs/binder/tests/parcel_fuzzer/test_fuzzer/Android.bp

+14 −0
Original line number Diff line number Diff line
@@ -40,3 +40,17 @@ 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",

    ],

    test_suites: ["general-tests"],

}

libs/binder/tests/parcel_fuzzer/test_fuzzer/fuzz_service_test_config.xml

0 → 100644
+22 −0
Original line number Diff line number Diff line 
<?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>

libs/binder/tests/parcel_fuzzer/test_fuzzer/run_fuzz_service_test.sh

0 → 100644
+42 −0
Original line number Diff line number Diff line 
#!/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