ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Ziparchive: Give tests a test config" am: cd67fa9c1a

Browse source 
am: 3a5dc38aea

Change-Id: I1f1bf7b0a510ded10fe5696db8c5896a91b9ffdf
This commit is contained in:
Andreas Gampe 2019-02-15 12:30:36 -08:00 • committed by android-build-merger
commit dd75c09657
2 changed files with 31 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
libziparchive/Android.bp
View file

@ -126,6 +126,7 @@ cc_test {
},
},
test_suites: ["device-tests"],
test_config: "ziparchive-tests.xml", // TODO: Remove after b/117891984.
}
// Performance benchmarks.

30
libziparchive/ziparchive-tests.xml Normal file
View file

@ -0,0 +1,30 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2019 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.
-->
<!-- Derived from auto-generated config. b/117891984 & b/124515549. -->
<configuration description="Runs ziparchive-tests.">
<option name="test-suite-tag" value="apct" />
<option name="test-suite-tag" value="apct-native" />
<target_preparer class="com.android.tradefed.targetprep.PushFilePreparer">
<option name="cleanup" value="true" />
<option name="push" value="ziparchive-tests->/data/local/tmp/ziparchive-tests/ziparchive-tests" />
<option name="push" value="testdata->/data/local/tmp/ziparchive-tests/testdata" />
</target_preparer>
<test class="com.android.tradefed.testtype.GTest" >
<option name="native-test-device-path" value="/data/local/tmp/ziparchive-tests" />
<option name="module-name" value="ziparchive-tests" />
</test>
</configuration>