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

Commit 847ff19f authored by Myles Watson's avatar Myles Watson Committed by android-build-merger
Browse files

Merge "Convert on-device tests to facade_only" 

am: db2e31da

Change-Id: Id54aafc0067615bfcc42ccbe0fcc4f71add7ad89
parents 552fa55c db2e31da

system/gd/cert/android_devices_config.json

+2 −5
Original line number Diff line number Diff line
@@ -24,10 +24,7 @@ 
                        "--btsnoop=data/misc/bluetooth/logs/btsnoop_hci.log",

                        "--signal-port=$(signal_port)"

                    ]

                }

            ],

            "GdCertDevice":

            [

                },

                {

                    "grpc_port": "8898",

                    "grpc_root_server_port": "8896",
@@ -40,7 +37,7 @@ 
                        "-s",

                        "$(serial_number)",

                        "shell",

                        "/system/bin/bluetooth_cert_stack",

                        "/system/bin/bluetooth_stack_with_facade",

                        "--grpc-port=$(grpc_port)",

                        "--root-server-port=$(grpc_root_server_port)",

                        "--btsnoop=data/misc/bluetooth/logs/btsnoop_hci.log",

system/gd/cert/gd_device_base.py

+3 −0
Original line number Diff line number Diff line
@@ -40,6 +40,9 @@ def replace_vars(string, config): 
    rootcanal_port = config.get("rootcanal_port")

    if rootcanal_port is None:

        rootcanal_port = ""

    if serial_number == "DUT" or serial_number == "CERT":

        logging.warn("Did you forget to configure the serial number?")

        raise Exception

    return string.replace("$ANDROID_HOST_OUT", ANDROID_HOST_OUT) \

                 .replace("$(grpc_port)", config.get("grpc_port")) \

                 .replace("$(grpc_root_server_port)", config.get("grpc_root_server_port")) \

system/gd/cert/run_device_cert.sh

+1 −1
Original line number Diff line number Diff line 
#! /bin/bash



# For bluetooth_packets_python3

PYTHONPATH=$PYTHONPATH:$ANDROID_BUILD_TOP/out/host/linux-x86/lib64 python3.8 `which act.py` -c $ANDROID_BUILD_TOP/packages/modules/Bluetooth/system/gd/cert/android_devices_config.json -tf $ANDROID_BUILD_TOP/packages/modules/Bluetooth/system/gd/cert/cert_testcases -tp $ANDROID_BUILD_TOP/packages/modules/Bluetooth/system/gd
 
PYTHONPATH=$PYTHONPATH:$ANDROID_BUILD_TOP/out/host/linux-x86/lib64 python3.8 `which act.py` -c $ANDROID_BUILD_TOP/packages/modules/Bluetooth/system/gd/cert/android_devices_config.json -tf $ANDROID_BUILD_TOP/packages/modules/Bluetooth/system/gd/cert/cert_testcases_facade_only -tp $ANDROID_BUILD_TOP/packages/modules/Bluetooth/system/gd