Revert "Cleanup jvmti tests"
Breaks ndebug.
This reverts commit ca5b9dccced35a2dbf9626d92d3a44886aee097b.
Change-Id: I1f45fa43f554e9796f397b2f9f111689c3845692
diff --git a/test/901-hello-ti-agent/run b/test/901-hello-ti-agent/run
index 4379349..8079a8c 100755
--- a/test/901-hello-ti-agent/run
+++ b/test/901-hello-ti-agent/run
@@ -14,6 +14,14 @@
# See the License for the specific language governing permissions and
# limitations under the License.
+plugin=libopenjdkjvmtid.so
+agent=libtiagentd.so
+if [[ "$@" == *"-O"* ]]; then
+ agent=libtiagent.so
+ plugin=libopenjdkjvmti.so
+fi
+
./default-run "$@" --experimental agents \
--experimental runtime-plugins \
- --jvmti
+ --runtime-option -agentpath:${agent}=901-hello-ti-agent \
+ --android-runtime-option -Xplugin:${plugin}