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

Commit f88e927a authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Improve cert set up"

parents 09237317 e757eeb2

system/gd/cert/gd_base_test.py

+3 −4
Original line number Diff line number Diff line
@@ -30,9 +30,6 @@ sys.path.append( 
    '/out/soong/.intermediates/packages/modules/Bluetooth/system/gd/BluetoothFacadeAndCertGeneratedStub_py/gen'

)



ANDROID_HOST_OUT = os.environ.get('ANDROID_HOST_OUT')

ROOTCANAL = ANDROID_HOST_OUT + "/nativetest64/root-canal/root-canal"





class GdBaseTestClass(BaseTestClass):
@@ -51,9 +48,11 @@ class GdBaseTestClass(BaseTestClass): 
            self.rootcanal_logs = open(rootcanal_logpath, 'w')

            rootcanal_config = self.controller_configs['rootcanal']

            rootcanal_hci_port = str(rootcanal_config.get("hci_port", "6402"))

            android_host_out = os.environ.get('ANDROID_HOST_OUT')

            rootcanal = android_host_out + "/nativetest64/root-canal/root-canal"

            self.rootcanal_process = subprocess.Popen(

                [

                    ROOTCANAL,

                    rootcanal,

                    str(rootcanal_config.get("test_port", "6401")),

                    rootcanal_hci_port,

                    str(rootcanal_config.get("link_layer_port", "6403"))

system/gd/cert/gd_base_test_facade_only.py

+3 −4
Original line number Diff line number Diff line
@@ -30,9 +30,6 @@ sys.path.append( 
    '/out/soong/.intermediates/packages/modules/Bluetooth/system/gd/BluetoothFacadeAndCertGeneratedStub_py/gen'

)



ANDROID_HOST_OUT = os.environ.get('ANDROID_HOST_OUT')

ROOTCANAL = ANDROID_HOST_OUT + "/nativetest64/root-canal/root-canal"





class GdFacadeOnlyBaseTestClass(BaseTestClass):
@@ -50,9 +47,11 @@ class GdFacadeOnlyBaseTestClass(BaseTestClass): 
            self.rootcanal_logs = open(rootcanal_logpath, 'w')

            rootcanal_config = self.controller_configs['rootcanal']

            rootcanal_hci_port = str(rootcanal_config.get("hci_port", "6402"))

            android_host_out = os.environ.get('ANDROID_HOST_OUT')

            rootcanal = android_host_out + "/nativetest64/root-canal/root-canal"

            self.rootcanal_process = subprocess.Popen(

                [

                    ROOTCANAL,

                    rootcanal,

                    str(rootcanal_config.get("test_port", "6401")),

                    rootcanal_hci_port,

                    str(rootcanal_config.get("link_layer_port", "6403"))

system/gd/cert/run_cert.sh

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



# For bluetooth_packets_python3

if [[ -z "${ANDROID_BUILD_TOP}" ]]; then

  echo "ANDROID_BUILD_TOP is not set"

fi



if [[ -z "${ANDROID_HOST_OUT}" ]]; then

  echo "ANDROID_HOST_OUT is not set for host run"

fi



# Run normal facade to cert API tests

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

system/gd/cert/run_cert_facade_only.sh

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

# For bluetooth_packets_python3



if [[ -z "${ANDROID_BUILD_TOP}" ]]; then

  echo "ANDROID_BUILD_TOP is not set"

fi



if [[ -z "${ANDROID_HOST_OUT}" ]]; then

  echo "ANDROID_HOST_OUT is not set for host run"

fi



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