Skip to content

Commit

Permalink
Create a new test template for slow run tests.
Browse files Browse the repository at this point in the history
Test: atest 175-alloc-big-bignums
Change-Id: I01427f3ad57db96d0a3f1c823817bcc0076bceec
  • Loading branch information
Nicolas Geoffray committed Feb 17, 2022
1 parent 0bdef31 commit b6a2907
Show file tree
Hide file tree
Showing 4 changed files with 65 additions and 2 deletions.
2 changes: 1 addition & 1 deletion test/175-alloc-big-bignums/Android.bp
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ package {
java_test {
name: "art-run-test-175-alloc-big-bignums",
defaults: ["art-run-test-defaults"],
test_config_template: ":art-run-test-target-template",
test_config_template: ":art-run-test-target-slow-template",
srcs: ["src/**/*.java"],
data: [
":art-run-test-175-alloc-big-bignums-expected-stdout",
Expand Down
8 changes: 8 additions & 0 deletions test/Android.bp
Original file line number Diff line number Diff line change
Expand Up @@ -469,6 +469,14 @@ filegroup {
],
}

// Same as above, but with a longer timeout.
filegroup {
name: "art-run-test-target-slow-template",
srcs: [
"art-run-test-target-slow-template.xml",
],
}

// Test configuration template for ART run-tests on target expected to run
// successfully, and as such *not* tagged as part of TradeFed's
// `art-target-run-test` test suite via the `test-suite-tag`. This is as
Expand Down
45 changes: 45 additions & 0 deletions test/art-run-test-target-slow-template.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2020 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.
-->
<!-- Note: This test config for {MODULE} is generated from a template. -->
<configuration description="Test module config for {MODULE}">
<option name="test-suite-tag" value="art-target-run-test" />
<option name="config-descriptor:metadata" key="mainline-param" value="com.google.android.art.apex" />

<target_preparer class="com.android.tradefed.targetprep.PushFilePreparer">
<option name="cleanup" value="true" />
<!-- TODO: Use option `push-file` instead of deprecated option
`push`. -->
<option name="push" value="{MODULE}.jar->/data/local/tmp/{MODULE}/{MODULE}.jar" />
</target_preparer>

<test class="com.android.tradefed.testtype.ArtRunTest">
<option name="run-test-name" value="{MODULE}" />
<option name="classpath" value="/data/local/tmp/{MODULE}/{MODULE}.jar" />
<option name="test-timeout" value="120000" />
</test>

<!-- When this test is run in a Mainline context (e.g. with `mts-tradefed`), only enable it if
one of the Mainline modules below is present on the device used for testing. -->
<object type="module_controller" class="com.android.tradefed.testtype.suite.module.MainlineTestModuleController">
<!-- ART Mainline Module (internal version). -->
<option name="mainline-module-package-name" value="com.google.android.art" />
<!-- ART Mainline Module (external (AOSP) version). -->
<option name="mainline-module-package-name" value="com.android.art" />
</object>

<!-- Only run tests if the device under test is SDK version 31 (Android 12) or above. -->
<object type="module_controller" class="com.android.tradefed.testtype.suite.module.Sdk31ModuleController" />
</configuration>
12 changes: 11 additions & 1 deletion test/utils/regen-test-files
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,10 @@ runnable_test_exceptions = frozenset([
"821-madvise-willneed",
])

known_slow_tests = frozenset([
"175-alloc-big-bignums",
])

# Known failing ART run-tests.
# TODO(rpl): Investigate and address the causes of failures.
known_failing_tests = frozenset([
Expand Down Expand Up @@ -417,6 +421,9 @@ class Generator:
# All other tests are considered runnable.
return True

def is_slow(self, run_test):
return run_test in known_slow_tests

def regen_bp_files(self, run_tests, buildable_tests):
for run_test in run_tests:
# Remove any previously generated file.
Expand All @@ -437,7 +444,10 @@ class Generator:
run_test_module_name = ART_RUN_TEST_MODULE_NAME_PREFIX + run_test

if self.is_runnable(run_test):
test_config_template = "art-run-test-target-template"
if self.is_slow(run_test):
test_config_template= "art-run-test-target-slow-template"
else:
test_config_template = "art-run-test-target-template"
else:
test_config_template = "art-run-test-target-no-test-suite-tag-template"

Expand Down

0 comments on commit b6a2907

Please sign in to comment.