diff options
author | Yuexi Ma <yuexima@google.com> | 2021-03-19 18:05:32 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-03-19 18:05:32 +0000 |
commit | 665abd76c3b5623a989c1c3847d41fa46182f28b (patch) | |
tree | 2d4ddda4eca9da769f1792e64b372f12305fe788 | |
parent | a9ceee067b4ead3e3a941610a9252fed1dfeb176 (diff) | |
parent | dc532c1b287625902a7b6ec9c1ba5d1562e1685f (diff) | |
download | csuite-665abd76c3b5623a989c1c3847d41fa46182f28b.tar.gz |
Replace test plan xml configs with csuite_test soong targets am: 4b34a6a846 am: c0b6a458c4 am: dc532c1b28
Original change: https://android-review.googlesource.com/c/platform/test/app_compat/csuite/+/1624940
Change-Id: I5bff07b3db83d6abe1bca916a6078804ea2d999d
-rw-r--r-- | harness/src/main/resources/config/csuite-app-launch.xml | 22 | ||||
-rw-r--r-- | harness/src/main/resources/config/csuite-system-app-launch.xml | 22 | ||||
-rw-r--r-- | harness/src/main/resources/config/csuite-test-package-launch.xml | 22 | ||||
-rw-r--r-- | tests/csuite-app-launch/Android.bp | 18 | ||||
-rw-r--r-- | tests/csuite-app-launch/template.xml (renamed from harness/src/main/resources/config/csuite-app-launch.xml.template) | 0 | ||||
-rw-r--r-- | tests/csuite-system-app-launch/Android.bp | 18 | ||||
-rw-r--r-- | tests/csuite-system-app-launch/template.xml (renamed from harness/src/main/resources/config/csuite-system-app-launch.xml.template) | 0 | ||||
-rw-r--r-- | tests/csuite-test-package-launch/Android.bp | 18 | ||||
-rw-r--r-- | tests/csuite-test-package-launch/template.xml (renamed from harness/src/main/resources/config/csuite-test-package-launch.xml.template) | 0 |
9 files changed, 54 insertions, 66 deletions
diff --git a/harness/src/main/resources/config/csuite-app-launch.xml b/harness/src/main/resources/config/csuite-app-launch.xml deleted file mode 100644 index 6913382..0000000 --- a/harness/src/main/resources/config/csuite-app-launch.xml +++ /dev/null @@ -1,22 +0,0 @@ -<?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. ---> -<configuration description="C-Suite Compatibility Launch Test Plan"> - <test class="com.android.csuite.config.ModuleGenerator" > - <option name="template" value="config/csuite-app-launch.xml.template" /> - </test> - <include name="csuite-base" /> - <option name="plan" value="csuite-app-launch" /> -</configuration> diff --git a/harness/src/main/resources/config/csuite-system-app-launch.xml b/harness/src/main/resources/config/csuite-system-app-launch.xml deleted file mode 100644 index 816ad8c..0000000 --- a/harness/src/main/resources/config/csuite-system-app-launch.xml +++ /dev/null @@ -1,22 +0,0 @@ -<?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. ---> -<configuration description="C-Suite Compatibility Launch Test Plan"> - <test class="com.android.csuite.config.ModuleGenerator" > - <option name="template" value="config/csuite-system-app-launch.xml.template" /> - </test> - <include name="csuite-base" /> - <option name="plan" value="csuite-system-app-launch" /> -</configuration>
\ No newline at end of file diff --git a/harness/src/main/resources/config/csuite-test-package-launch.xml b/harness/src/main/resources/config/csuite-test-package-launch.xml deleted file mode 100644 index 27c310a..0000000 --- a/harness/src/main/resources/config/csuite-test-package-launch.xml +++ /dev/null @@ -1,22 +0,0 @@ -<?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. ---> -<configuration description="C-Suite Compatibility Launch Test Plan"> - <test class="com.android.csuite.config.ModuleGenerator" > - <option name="template" value="config/csuite-test-package-launch.xml.template" /> - </test> - <include name="csuite-base" /> - <option name="plan" value="csuite-test-package-launch" /> -</configuration>
\ No newline at end of file diff --git a/tests/csuite-app-launch/Android.bp b/tests/csuite-app-launch/Android.bp new file mode 100644 index 0000000..b5a49b2 --- /dev/null +++ b/tests/csuite-app-launch/Android.bp @@ -0,0 +1,18 @@ +// Copyright (C) 2021 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. + +csuite_test { + name: "csuite-app-launch", + test_config_template: "template.xml" +} diff --git a/harness/src/main/resources/config/csuite-app-launch.xml.template b/tests/csuite-app-launch/template.xml index 52c4611..52c4611 100644 --- a/harness/src/main/resources/config/csuite-app-launch.xml.template +++ b/tests/csuite-app-launch/template.xml diff --git a/tests/csuite-system-app-launch/Android.bp b/tests/csuite-system-app-launch/Android.bp new file mode 100644 index 0000000..bf13297 --- /dev/null +++ b/tests/csuite-system-app-launch/Android.bp @@ -0,0 +1,18 @@ +// Copyright (C) 2021 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. + +csuite_test { + name: "csuite-system-app-launch", + test_config_template: "template.xml" +} diff --git a/harness/src/main/resources/config/csuite-system-app-launch.xml.template b/tests/csuite-system-app-launch/template.xml index 4d1181b..4d1181b 100644 --- a/harness/src/main/resources/config/csuite-system-app-launch.xml.template +++ b/tests/csuite-system-app-launch/template.xml diff --git a/tests/csuite-test-package-launch/Android.bp b/tests/csuite-test-package-launch/Android.bp new file mode 100644 index 0000000..5f9caff --- /dev/null +++ b/tests/csuite-test-package-launch/Android.bp @@ -0,0 +1,18 @@ +// Copyright (C) 2021 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. + +csuite_test { + name: "csuite-test-package-launch", + test_config_template: "template.xml" +} diff --git a/harness/src/main/resources/config/csuite-test-package-launch.xml.template b/tests/csuite-test-package-launch/template.xml index 9c97fd3..9c97fd3 100644 --- a/harness/src/main/resources/config/csuite-test-package-launch.xml.template +++ b/tests/csuite-test-package-launch/template.xml |