You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by sm...@apache.org on 2007/12/26 09:40:09 UTC
svn commit: r606856 - in
/harmony/enhanced/buildtest/branches/2.0/tests/vts/vm: config/
src/test/vm/jvmti/funcs/ClearFieldModif/ClearFieldModif0104/
src/test/vm/jvmti/funcs/SetFieldModificationWatch/SetFieldModificationWatch0104/
Author: smishura
Date: Wed Dec 26 00:40:08 2007
New Revision: 606856
URL: http://svn.apache.org/viewvc?rev=606856&view=rev
Log:
Apply patch from HARMONY-4329
[buildtest][vts] 2 tests vm/jvmti/funcs invoke Set[Clear]FieldModificationWatch methods with correct arguments but expect that VM returns error code
Remove the tests from the exclude list (tested on Linux ia32)
Modified:
harmony/enhanced/buildtest/branches/2.0/tests/vts/vm/config/exclude.file
harmony/enhanced/buildtest/branches/2.0/tests/vts/vm/src/test/vm/jvmti/funcs/ClearFieldModif/ClearFieldModif0104/ClearFieldModif0104.cpp
harmony/enhanced/buildtest/branches/2.0/tests/vts/vm/src/test/vm/jvmti/funcs/SetFieldModificationWatch/SetFieldModificationWatch0104/SetFieldModificationWatch0104.cpp
Modified: harmony/enhanced/buildtest/branches/2.0/tests/vts/vm/config/exclude.file
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/branches/2.0/tests/vts/vm/config/exclude.file?rev=606856&r1=606855&r2=606856&view=diff
==============================================================================
--- harmony/enhanced/buildtest/branches/2.0/tests/vts/vm/config/exclude.file (original)
+++ harmony/enhanced/buildtest/branches/2.0/tests/vts/vm/config/exclude.file Wed Dec 26 00:40:08 2007
@@ -23,7 +23,6 @@
vm/jvmti/events/DataDumpRequest/DataDumpRequest0101/DataDumpRequest0101.xml
vm/jvmti/events/MonitorContendedEntered/MonitorContendedEntered0102/MonitorContendedEntered0102.xml
vm/jvmti/funcs/AddToBootCLSearch/AddToBootCLSearch0102/AddToBootCLSearch0102.xml
-vm/jvmti/funcs/ClearFieldModif/ClearFieldModif0104/ClearFieldModif0104.xml
vm/jvmti/funcs/GenerateEvents/GenerateEvents0104/GenerateEvents0104.xml
vm/jvmti/funcs/GetClassSignature/GetClassSignature0102/GetClassSignature0102.xml
vm/jvmti/funcs/GetFieldDeclaringClass/GetFieldDeclaringClass0103/GetFieldDeclaringClass0103.xml
@@ -46,7 +45,6 @@
vm/jvmti/funcs/SetEventNotificationMode/SetEventNotificationMode0104/SetEventNotificationMode0104.xml
vm/jvmti/funcs/SetEventNotificationMode/SetEventNotificationMode0106/SetEventNotificationMode0106.xml
vm/jvmti/funcs/SetEventNotificationMode/SetEventNotificationMode0107/SetEventNotificationMode0107.xml
-vm/jvmti/funcs/SetFieldModificationWatch/SetFieldModificationWatch0104/SetFieldModificationWatch0104.xml
vm/jvmti/funcs/StopThread/StopThread0101/StopThread0101.xml
vm/jvmti/funcs/StopThread/StopThread0105/StopThread0105.xml
Modified: harmony/enhanced/buildtest/branches/2.0/tests/vts/vm/src/test/vm/jvmti/funcs/ClearFieldModif/ClearFieldModif0104/ClearFieldModif0104.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/branches/2.0/tests/vts/vm/src/test/vm/jvmti/funcs/ClearFieldModif/ClearFieldModif0104/ClearFieldModif0104.cpp?rev=606856&r1=606855&r2=606856&view=diff
==============================================================================
--- harmony/enhanced/buildtest/branches/2.0/tests/vts/vm/src/test/vm/jvmti/funcs/ClearFieldModif/ClearFieldModif0104/ClearFieldModif0104.cpp (original)
+++ harmony/enhanced/buildtest/branches/2.0/tests/vts/vm/src/test/vm/jvmti/funcs/ClearFieldModif/ClearFieldModif0104/ClearFieldModif0104.cpp Wed Dec 26 00:40:08 2007
@@ -76,7 +76,7 @@
fflush(stderr);
if (result != JVMTI_ERROR_NONE) return;
- result = jvmti_env->ClearFieldModificationWatch(myclass, myfield);
+ result = jvmti_env->ClearFieldModificationWatch(NULL, myfield);
fprintf(stderr, "\tnative: ClearFieldModificationWatch result = %d (must be JVMTI_ERROR_INVALID_CLASS (21)) \n", result);
fprintf(stderr, "\tnative: class is %p \n", myclass);
fprintf(stderr, "\tnative: field is %p \n", myfield);
Modified: harmony/enhanced/buildtest/branches/2.0/tests/vts/vm/src/test/vm/jvmti/funcs/SetFieldModificationWatch/SetFieldModificationWatch0104/SetFieldModificationWatch0104.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/branches/2.0/tests/vts/vm/src/test/vm/jvmti/funcs/SetFieldModificationWatch/SetFieldModificationWatch0104/SetFieldModificationWatch0104.cpp?rev=606856&r1=606855&r2=606856&view=diff
==============================================================================
--- harmony/enhanced/buildtest/branches/2.0/tests/vts/vm/src/test/vm/jvmti/funcs/SetFieldModificationWatch/SetFieldModificationWatch0104/SetFieldModificationWatch0104.cpp (original)
+++ harmony/enhanced/buildtest/branches/2.0/tests/vts/vm/src/test/vm/jvmti/funcs/SetFieldModificationWatch/SetFieldModificationWatch0104/SetFieldModificationWatch0104.cpp Wed Dec 26 00:40:08 2007
@@ -69,7 +69,7 @@
if (!is_needed_field_found(jvmti_env, "SetFieldModificationWatch0104.java", "third_field", &myclass, &myfield, DEBUG_OUT))
return;
- result = jvmti_env->SetFieldModificationWatch(myclass, myfield);
+ result = jvmti_env->SetFieldModificationWatch(NULL, myfield);
fprintf(stderr, "\tnative: SetFieldModificationWatch result = %d (must be JVMTI_ERROR_INVALID_CLASS (21)) \n", result);
fflush(stderr);