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

Commit ee6d239b authored by Qiao Yang's avatar Qiao Yang Committed by Automerger Merge Worker
Browse files

Merge "BumbleBluetoothTests: move to general-tests" am: 7efc8cbf 

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/2547595



Change-Id: I3424e5fa3eaa3765fedfad49b6cc1aa8285609c8
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 83dc11af 7efc8cbf

framework/tests/bumble/Android.bp

+4 −3
Original line number Original line Diff line number Diff line
@@ -35,7 +35,7 @@ android_test_helper_app { 




    platform_apis: true,

    platform_apis: true,

    test_suites: [

    test_suites: [

        "device-tests",

        "general-tests",

    ],

    ],

}

}
@@ -49,12 +49,13 @@ java_test_host { 
    ],

    ],





    data: [

    data: [

        ":BumbleBluetoothTestsApp"

        ":BumbleBluetoothTestsApp",

        ":bumble_pandora_server"

    ],

    ],





    required: ["bumble_pandora_server"],

    required: ["bumble_pandora_server"],





    test_suites: [

    test_suites: [

        "device-tests",

        "general-tests",

    ],

    ],

}
 
}

framework/tests/bumble/AndroidTest.xml

+1 −1
Original line number Original line Diff line number Diff line
@@ -15,7 +15,7 @@ 
      <option name="python-virtualenv" value="true"/>

      <option name="python-virtualenv" value="true"/>

      <option name="host-setup-command" value="adb -s $SERIAL reverse tcp:7999 tcp:7999" />

      <option name="host-setup-command" value="adb -s $SERIAL reverse tcp:7999 tcp:7999" />

      <option name="host-background-command"

      <option name="host-background-command"

        value="$EXTRA_FILE(host_testcases)/bumble_pandora_server/x86_64/bumble_pandora_server"/>

        value="$EXTRA_FILE(host_testcases)/BumbleBluetoothTests/bumble_pandora_server"/>

      <option name="host-teardown-command" value="adb -s $SERIAL reverse --remove tcp:7999" />

      <option name="host-teardown-command" value="adb -s $SERIAL reverse --remove tcp:7999" />

    </target_preparer>

    </target_preparer>