Revert "Revert "Cleanup jvmti tests""
This reverts commit 2a9d198b9929560c9ab07691b3afbe275483be95.
Test: mma -j40 test-art-host
Test: ART_TEST_RUN_TEST_NDEBUG=true mma -j40 test-art-host
Change-Id: I14bfd02f74f93e4a6b853287fcaa69f1fb027256
diff --git a/test/904-object-allocation/run b/test/904-object-allocation/run
index 2f7ad21..4379349 100755
--- a/test/904-object-allocation/run
+++ b/test/904-object-allocation/run
@@ -14,30 +14,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-plugin=libopenjdkjvmtid.so
-agent=libtiagentd.so
-lib=tiagentd
-if [[ "$@" == *"-O"* ]]; then
- agent=libtiagent.so
- plugin=libopenjdkjvmti.so
- lib=tiagent
-fi
-
-if [[ "$@" == *"--jvm"* ]]; then
- arg="jvm"
-else
- arg="art"
-fi
-
-if [[ "$@" != *"--debuggable"* ]]; then
- other_args=" -Xcompiler-option --debuggable "
-else
- other_args=""
-fi
-
./default-run "$@" --experimental agents \
--experimental runtime-plugins \
- --runtime-option -agentpath:${agent}=904-object-allocation,${arg} \
- --android-runtime-option -Xplugin:${plugin} \
- ${other_args} \
- --args ${lib}
+ --jvmti