Merge "Update profiler generator."
diff --git a/testcases/library/bionic_native_test/AndroidTest.xml b/testcases/library/bionic_native_test/AndroidTest.xml
deleted file mode 100644
index f0c3dde..0000000
--- a/testcases/library/bionic_native_test/AndroidTest.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2016 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="Config for VTS BionicNativeTest test cases">
- <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
- <option name="push-group" value="HostDrivenTest.push" />
- </target_preparer>
- <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
- <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
- <option name="test-module-name" value="BionicNativeTest" />
- <option name="binary-test-working-directories" value="
- _32bit::/data/local/tmp/nativetest,
- _64bit::/data/local/tmp/nativetest64"/>
- <option name="binary-test-ld-library-paths" value="
- _32bit::/data/local/tmp/nativetest/bionic-loader-test-libs,
- _64bit::/data/local/tmp/nativetest64/bionic-loader-test-libs" />
- <option name="binary-test-sources" value="
- _32bit::DATA/nativetest/bionic-unit-tests-gcc/bionic-unit-tests-gcc,
- _64bit::DATA/nativetest64/bionic-unit-tests-gcc/bionic-unit-tests-gcc,
- _32bit::DATA/nativetest/bionic-unit-tests/bionic-unit-tests,
- _64bit::DATA/nativetest64/bionic-unit-tests/bionic-unit-tests,
- _32bit::DATA/nativetest/bionic-unit-tests-static/bionic-unit-tests-static,
- _64bit::DATA/nativetest64/bionic-unit-tests-static/bionic-unit-tests-static,
- _32bit::DATA/nativetest/bionic-loader-test-libs->,
- _64bit::DATA/nativetest64/bionic-loader-test-libs->
- "/>
- <option name="binary-test-type" value="gtest" />
- </test>
-</configuration>
diff --git a/testcases/library/bionic_unit_tests/AndroidTest.xml b/testcases/library/bionic_unit_tests/AndroidTest.xml
index 1170d69..7dd8cee 100644
--- a/testcases/library/bionic_unit_tests/AndroidTest.xml
+++ b/testcases/library/bionic_unit_tests/AndroidTest.xml
@@ -16,34 +16,15 @@
<configuration description="Config for VTS BionicUnitTests test cases">
<target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
<option name="push-group" value="HostDrivenTest.push" />
+ <option name="push" value="DATA/nativetest/bionic-loader-test-libs->/data/nativetest/bionic-loader-test-lib" />
+ <option name="push" value="DATA/nativetest64/bionic-loader-test-libs->/data/nativetest64/bionic-loader-test-libs" />
</target_preparer>
<target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
<test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
<option name="test-module-name" value="BionicUnitTests" />
- <option name="binary-test-ld-library-paths" value="
- _32bit::/data/local/tmp/nativetest,
- _32bit::/data/nativetest/bionic-loader-test-libs,
- _32bit::/data/nativetest/bionic-loader-test-libs/libdlext_test_fd,
- _32bit::/data/nativetest/bionic-loader-test-libs/dt_runpath_b_c_x,
- _32bit::/data/nativetest/bionic-loader-test-libs/libdlext_test_runpath_zip,
- _32bit::/data/nativetest/bionic-loader-test-libs/public_namespace_libs,
- _32bit::/data/nativetest/bionic-loader-test-libs/dt_runpath_a,
- _32bit::/data/nativetest/bionic-loader-test-libs/libatest_simple_zip,
- _32bit::/data/nativetest/bionic-loader-test-libs/prebuilt-elf-files,
- _64bit::/data/local/tmp/nativetest64,
- _64bit::/data/nativetest64/bionic-loader-test-libs,
- _64bit::/data/nativetest64/bionic-loader-test-libs/libdlext_test_fd,
- _64bit::/data/nativetest64/bionic-loader-test-libs/dt_runpath_b_c_x,
- _64bit::/data/nativetest64/bionic-loader-test-libs/libdlext_test_runpath_zip,
- _64bit::/data/nativetest64/bionic-loader-test-libs/public_namespace_libs,
- _64bit::/data/nativetest64/bionic-loader-test-libs/dt_runpath_a,
- _64bit::/data/nativetest64/bionic-loader-test-libs/libatest_simple_zip,
- _64bit::/data/nativetest64/bionic-loader-test-libs/prebuilt-elf-files," />
<option name="binary-test-sources" value="
- _32bit::DATA/nativetest/bionic-unit-tests/bionic-unit-tests,
- _64bit::DATA/nativetest64/bionic-unit-tests/bionic-unit-tests,
- _32bit::DATA/nativetest/bionic-loader-test-libs->/data/nativetest/bionic-loader-test-libs,
- _64bit::DATA/nativetest64/bionic-loader-test-libs->/data/nativetest64/bionic-loader-test-libs
+ _32bit::DATA/nativetest/bionic-unit-tests/bionic-unit-tests->/data/nativetest/bionic-unit-tests/bionic-unit-tests,
+ _64bit::DATA/nativetest64/bionic-unit-tests/bionic-unit-tests->/data/nativetest64/bionic-unit-tests/bionic-unit-tests
"/>
<option name="binary-test-type" value="gtest" />
</test>
diff --git a/testcases/library/bionic_unit_tests_gcc/AndroidTest.xml b/testcases/library/bionic_unit_tests_gcc/AndroidTest.xml
index ef7ea02..740bca7 100644
--- a/testcases/library/bionic_unit_tests_gcc/AndroidTest.xml
+++ b/testcases/library/bionic_unit_tests_gcc/AndroidTest.xml
@@ -16,34 +16,15 @@
<configuration description="Config for VTS BionicUnitTestsGcc test cases">
<target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
<option name="push-group" value="HostDrivenTest.push" />
+ <option name="push" value="DATA/nativetest/bionic-loader-test-libs->/data/nativetest/bionic-loader-test-lib" />
+ <option name="push" value="DATA/nativetest64/bionic-loader-test-libs->/data/nativetest64/bionic-loader-test-libs" />
</target_preparer>
<target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
<test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
<option name="test-module-name" value="BionicUnitTestsGcc" />
- <option name="binary-test-ld-library-paths" value="
- _32bit::/data/local/tmp/nativetest,
- _32bit::/data/nativetest/bionic-loader-test-libs,
- _32bit::/data/nativetest/bionic-loader-test-libs/libdlext_test_fd,
- _32bit::/data/nativetest/bionic-loader-test-libs/dt_runpath_b_c_x,
- _32bit::/data/nativetest/bionic-loader-test-libs/libdlext_test_runpath_zip,
- _32bit::/data/nativetest/bionic-loader-test-libs/public_namespace_libs,
- _32bit::/data/nativetest/bionic-loader-test-libs/dt_runpath_a,
- _32bit::/data/nativetest/bionic-loader-test-libs/libatest_simple_zip,
- _32bit::/data/nativetest/bionic-loader-test-libs/prebuilt-elf-files,
- _64bit::/data/local/tmp/nativetest64,
- _64bit::/data/nativetest64/bionic-loader-test-libs,
- _64bit::/data/nativetest64/bionic-loader-test-libs/libdlext_test_fd,
- _64bit::/data/nativetest64/bionic-loader-test-libs/dt_runpath_b_c_x,
- _64bit::/data/nativetest64/bionic-loader-test-libs/libdlext_test_runpath_zip,
- _64bit::/data/nativetest64/bionic-loader-test-libs/public_namespace_libs,
- _64bit::/data/nativetest64/bionic-loader-test-libs/dt_runpath_a,
- _64bit::/data/nativetest64/bionic-loader-test-libs/libatest_simple_zip,
- _64bit::/data/nativetest64/bionic-loader-test-libs/prebuilt-elf-files," />
<option name="binary-test-sources" value="
- _32bit::DATA/nativetest/bionic-unit-tests-gcc/bionic-unit-tests-gcc,
- _64bit::DATA/nativetest64/bionic-unit-tests-gcc/bionic-unit-tests-gcc,
- _32bit::DATA/nativetest/bionic-loader-test-libs->/data/nativetest/bionic-loader-test-libs,
- _64bit::DATA/nativetest64/bionic-loader-test-libs->/data/nativetest64/bionic-loader-test-libs
+ _32bit::DATA/nativetest/bionic-unit-tests-gcc/bionic-unit-tests-gcc->/data/nativetest/bionic-unit-tests-gcc/bionic-unit-tests-gcc,
+ _64bit::DATA/nativetest64/bionic-unit-tests-gcc/bionic-unit-tests-gcc->/data/nativetest64/bionic-unit-tests-gcc/bionic-unit-tests-gcc
"/>
<option name="binary-test-type" value="gtest" />
</test>
diff --git a/testcases/library/bionic_unit_tests_static/AndroidTest.xml b/testcases/library/bionic_unit_tests_static/AndroidTest.xml
index 50493bd..73202a5 100644
--- a/testcases/library/bionic_unit_tests_static/AndroidTest.xml
+++ b/testcases/library/bionic_unit_tests_static/AndroidTest.xml
@@ -16,34 +16,15 @@
<configuration description="Config for VTS BionicUnitTestsStatic test cases">
<target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
<option name="push-group" value="HostDrivenTest.push" />
+ <option name="push" value="DATA/nativetest/bionic-loader-test-libs->/data/nativetest/bionic-loader-test-lib" />
+ <option name="push" value="DATA/nativetest64/bionic-loader-test-libs->/data/nativetest64/bionic-loader-test-libs" />
</target_preparer>
<target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
<test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
<option name="test-module-name" value="BionicUnitTestsStatic" />
- <option name="binary-test-ld-library-paths" value="
- _32bit::/data/local/tmp/nativetest,
- _32bit::/data/nativetest/bionic-loader-test-libs,
- _32bit::/data/nativetest/bionic-loader-test-libs/libdlext_test_fd,
- _32bit::/data/nativetest/bionic-loader-test-libs/dt_runpath_b_c_x,
- _32bit::/data/nativetest/bionic-loader-test-libs/libdlext_test_runpath_zip,
- _32bit::/data/nativetest/bionic-loader-test-libs/public_namespace_libs,
- _32bit::/data/nativetest/bionic-loader-test-libs/dt_runpath_a,
- _32bit::/data/nativetest/bionic-loader-test-libs/libatest_simple_zip,
- _32bit::/data/nativetest/bionic-loader-test-libs/prebuilt-elf-files,
- _64bit::/data/local/tmp/nativetest64,
- _64bit::/data/nativetest64/bionic-loader-test-libs,
- _64bit::/data/nativetest64/bionic-loader-test-libs/libdlext_test_fd,
- _64bit::/data/nativetest64/bionic-loader-test-libs/dt_runpath_b_c_x,
- _64bit::/data/nativetest64/bionic-loader-test-libs/libdlext_test_runpath_zip,
- _64bit::/data/nativetest64/bionic-loader-test-libs/public_namespace_libs,
- _64bit::/data/nativetest64/bionic-loader-test-libs/dt_runpath_a,
- _64bit::/data/nativetest64/bionic-loader-test-libs/libatest_simple_zip,
- _64bit::/data/nativetest64/bionic-loader-test-libs/prebuilt-elf-files," />
<option name="binary-test-sources" value="
- _32bit::DATA/nativetest/bionic-unit-tests-static/bionic-unit-tests-static,
- _64bit::DATA/nativetest64/bionic-unit-tests-static/bionic-unit-tests-static,
- _32bit::DATA/nativetest/bionic-loader-test-libs->/data/nativetest/bionic-loader-test-libs,
- _64bit::DATA/nativetest64/bionic-loader-test-libs->/data/nativetest64/bionic-loader-test-libs
+ _32bit::DATA/nativetest/bionic-unit-tests-static/bionic-unit-tests-static->/data/nativetest/bionic-unit-tests-static/bionic-unit-tests-static,
+ _64bit::DATA/nativetest64/bionic-unit-tests-static/bionic-unit-tests-static->/data/nativetest64/bionic-unit-tests-static/bionic-unit-tests-static
"/>
<option name="binary-test-type" value="gtest" />
</test>