mollyim/webrtc
1
0
Fork 0
mirror of https://github.com/mollyim/webrtc.git synced 2025-05-13 13:50:40 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Reland "Default runner to junit4"

Browse source 
This is a reland of 902093493b
(the breakage was unrelated)

Original change's description:
> Default runner to junit4
>
> Bug: chromium:868610
> Change-Id: Ifc457d8e74cf42e9ba4d21807721f86c521b35e9
> Reviewed-on: https://webrtc-review.googlesource.com/94440
> Reviewed-by: Sami Kalliomäki <sakal@webrtc.org>
> Reviewed-by: Patrik Höglund <phoglund@webrtc.org>
> Commit-Queue: Andrew Luo <aluo@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#24350}

TBR: phoglund@webrtc.org, sakal@webrtc.org
Cq-Include-Trybots: master.internal.tryserver.corp.webrtc:linux_internal
Bug: chromium:868610
Change-Id: Ie67829ccca8b652b0231952159ddbc1dae6b2cde
Reviewed-on: https://webrtc-review.googlesource.com/95200
Reviewed-by: Oleh Prypin <oprypin@webrtc.org>
Commit-Queue: Oleh Prypin <oprypin@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#24367}
This commit is contained in:
Andrew Luo 2018-08-15 18:15:19 -07:00 committed by Commit Bot
parent 50635036db
commit 18a86bfcc1
3 changed files with 4 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
examples/androidtests/AndroidManifest.xml
View file

@ -20,11 +20,8 @@
<uses-library android:name="android.test.runner" />
</application>
<!-- tools:ignore needed for chromium-junit4 tag. crbug.com/640116
TODO(sakal): Remove once the tag is no longer needed. -->
<instrumentation android:name="android.support.test.runner.AndroidJUnitRunner"
tools:ignore="MissingPrefix"
android:targetPackage="org.appspot.apprtc"
android:label="Tests for AppRTCMobile"
chromium-junit4="true"/>
android:label="Tests for AppRTCMobile"/>
</manifest>

5
sdk/android/instrumentationtests/AndroidManifest.xml
View file

@ -31,11 +31,8 @@
<uses-library android:name="android.test.runner" />
</application>
<!-- tools:ignore needed for chromium-junit4 tag. crbug.com/640116
TODO(sakal): Remove once the tag is no longer needed. -->
<instrumentation android:name="org.chromium.base.test.BaseChromiumAndroidJUnitRunner"
tools:ignore="MissingPrefix"
android:targetPackage="org.webrtc"
android:label="Tests for WebRTC Android SDK"
chromium-junit4="true"/>
android:label="Tests for WebRTC Android SDK"/>
</manifest>

3
test/android/AndroidManifest.xml
View file

@ -41,6 +41,7 @@ be found in the AUTHORS file in the root of the source tree.
<instrumentation android:name="org.chromium.native_test.NativeTestInstrumentationTestRunner"
android:targetPackage="org.webrtc.native_test"
android:label="Instrumentation entry point for org.webrtc.native_test"/>
android:label="Instrumentation entry point for org.webrtc.native_test"
chromium-junit3="true"/>
</manifest>