Menu
▾
▴
[rvm-commits] code: 2 new changesets
|
From: <jik...@li...> - 2012-11-07 10:56:39
|
details: http://hg.code.sourceforge.net/p/jikesrvm/code/rev/d354d5ca473b changeset: 10564:d354d5ca473b user: Erik Brangs <eri...@gm...> date: Wed Nov 07 11:38:50 2012 +0100 description: Add missing source and target level for javac tasks in test-runs (thanks to Da Feng for the hint). details: http://hg.code.sourceforge.net/p/jikesrvm/code/rev/4122387f6ee1 changeset: 10565:4122387f6ee1 user: Erik Brangs <eri...@gm...> date: Wed Nov 07 11:39:39 2012 +0100 description: Fix warnings in test classes. diffstat: testing/tests/CaffeineMark/build.xml | 2 +- testing/tests/basic/build.xml | 3 ++- testing/tests/basic/src/test/org/jikesrvm/basic/core/threads/TestStop.java | 1 + testing/tests/basic/src/test/org/jikesrvm/basic/core/threads/TestSuspend.java | 1 + testing/tests/gctest/build.xml | 2 +- testing/tests/gctracingtest/build.xml | 2 +- testing/tests/javalex/build.xml | 2 +- testing/tests/jni/build.xml | 2 +- testing/tests/jni/src/JNI12.java | 2 +- testing/tests/jsr166-tck/build.xml | 2 +- testing/tests/opttests/build.xml | 2 +- testing/tests/opttests/src/InvokeReflect.java | 2 +- 12 files changed, 13 insertions(+), 10 deletions(-) diffs (147 lines): diff --git a/testing/tests/CaffeineMark/build.xml b/testing/tests/CaffeineMark/build.xml --- a/testing/tests/CaffeineMark/build.xml +++ b/testing/tests/CaffeineMark/build.xml @@ -38,7 +38,7 @@ <target name="compile" depends="init"> <mkdir dir="${build.classes}"/> - <javac srcdir="${main.java}" destdir="${build.classes}" debug="true" classpath="${test.class.path}" includeantruntime="false"/> + <javac srcdir="${main.java}" destdir="${build.classes}" debug="true" classpath="${test.class.path}" source="1.6" target="1.6" includeantruntime="false"/> </target> <!-- **************************************************************************** --> diff --git a/testing/tests/basic/build.xml b/testing/tests/basic/build.xml --- a/testing/tests/basic/build.xml +++ b/testing/tests/basic/build.xml @@ -34,11 +34,12 @@ <target name="compile" depends="init"> <mkdir dir="${build.classes}"/> - <javac srcdir="${main.java}" destdir="${build.classes}" debug="true" includeantruntime="false"> + <javac srcdir="${main.java}" destdir="${build.classes}" debug="true" source="1.6" target="1.6" includeantruntime="false"> <!-- need extra classpath for vmmagic --> <classpath> <pathelement path="${test.rvm.dir}/jksvm.jar"/> </classpath> + <compilerarg value="-Xlint:deprecation"/> </javac> <jar file="${build.tests.dir}/AgentX.jar" basedir="${build.classes}" includes="**/AgentX.class"> diff --git a/testing/tests/basic/src/test/org/jikesrvm/basic/core/threads/TestStop.java b/testing/tests/basic/src/test/org/jikesrvm/basic/core/threads/TestStop.java --- a/testing/tests/basic/src/test/org/jikesrvm/basic/core/threads/TestStop.java +++ b/testing/tests/basic/src/test/org/jikesrvm/basic/core/threads/TestStop.java @@ -12,6 +12,7 @@ */ package test.org.jikesrvm.basic.core.threads; +@SuppressWarnings("deprecation") class TestStop { public static void main(String[] args) { final Worker w = new Worker(); diff --git a/testing/tests/basic/src/test/org/jikesrvm/basic/core/threads/TestSuspend.java b/testing/tests/basic/src/test/org/jikesrvm/basic/core/threads/TestSuspend.java --- a/testing/tests/basic/src/test/org/jikesrvm/basic/core/threads/TestSuspend.java +++ b/testing/tests/basic/src/test/org/jikesrvm/basic/core/threads/TestSuspend.java @@ -12,6 +12,7 @@ */ package test.org.jikesrvm.basic.core.threads; +@SuppressWarnings("deprecation") class TestSuspend extends XThread { static Thread sleeper; diff --git a/testing/tests/gctest/build.xml b/testing/tests/gctest/build.xml --- a/testing/tests/gctest/build.xml +++ b/testing/tests/gctest/build.xml @@ -55,7 +55,7 @@ <target name="compile" depends="init"> <mkdir dir="${build.classes}"/> - <javac srcdir="${main.java}" destdir="${build.classes}" debug="true" includeantruntime="false"> + <javac srcdir="${main.java}" destdir="${build.classes}" debug="true" source="1.6" target="1.6" includeantruntime="false"> <classpath> <pathelement path="${test.rvm.dir}/jksvm.jar"/> <pathelement path="${test.rvm.dir}/rvmrt.jar"/> diff --git a/testing/tests/gctracingtest/build.xml b/testing/tests/gctracingtest/build.xml --- a/testing/tests/gctracingtest/build.xml +++ b/testing/tests/gctracingtest/build.xml @@ -30,7 +30,7 @@ <target name="compile" depends="init"> <mkdir dir="${build.classes}"/> - <javac srcdir="${main.java}" destdir="${build.classes}" debug="true" includeantruntime="false"/> + <javac srcdir="${main.java}" destdir="${build.classes}" debug="true" source="1.6" target="1.6" includeantruntime="false"/> </target> <!-- **************************************************************************** --> diff --git a/testing/tests/javalex/build.xml b/testing/tests/javalex/build.xml --- a/testing/tests/javalex/build.xml +++ b/testing/tests/javalex/build.xml @@ -33,7 +33,7 @@ <target name="compile" depends="init"> <mkdir dir="${build.classes}"/> - <javac srcdir="${jlex.dir}" destdir="${build.classes}" debug="true" includeantruntime="false"/> + <javac srcdir="${jlex.dir}" destdir="${build.classes}" debug="true" source="1.4" target="1.4" includeantruntime="false"/> </target> diff --git a/testing/tests/jni/build.xml b/testing/tests/jni/build.xml --- a/testing/tests/jni/build.xml +++ b/testing/tests/jni/build.xml @@ -61,7 +61,7 @@ <target name="compile" depends="init"> <mkdir dir="${build.classes}"/> <mkdir dir="${build.native}"/> - <javac srcdir="${main.java}" destdir="${build.classes}" debug="true" includeantruntime="false"> + <javac srcdir="${main.java}" destdir="${build.classes}" debug="true" source="1.6" target="1.6" includeantruntime="false"> <exclude name="StackResize.java"/> <exclude name="NativeThreadsWorker.java"/> <exclude name="tNativeThreads.java"/> diff --git a/testing/tests/jni/src/JNI12.java b/testing/tests/jni/src/JNI12.java --- a/testing/tests/jni/src/JNI12.java +++ b/testing/tests/jni/src/JNI12.java @@ -54,7 +54,7 @@ Object returnObj; // Reflected Methods - Class myClass =JNI12.class; + Class<?> myClass =JNI12.class; Method dummyM = myClass.getMethod("dummyFunc", new Class[0]); returnObj = testReflectedMethods(myClass, dummyM); diff --git a/testing/tests/jsr166-tck/build.xml b/testing/tests/jsr166-tck/build.xml --- a/testing/tests/jsr166-tck/build.xml +++ b/testing/tests/jsr166-tck/build.xml @@ -52,7 +52,7 @@ <target name="compile" depends="init"> <mkdir dir="${build.classes}"/> - <javac srcdir="${main.java}" destdir="${build.classes}" debug="true" includeantruntime="false"> + <javac srcdir="${main.java}" destdir="${build.classes}" debug="true" source="1.5" target="1.5" includeantruntime="false"> <classpath> <pathelement path="${junit.jar}"/> </classpath> diff --git a/testing/tests/opttests/build.xml b/testing/tests/opttests/build.xml --- a/testing/tests/opttests/build.xml +++ b/testing/tests/opttests/build.xml @@ -34,7 +34,7 @@ <target name="compile" depends="init"> <mkdir dir="${build.classes}"/> - <javac srcdir="${main.java}" destdir="${build.classes}" debug="true" includeantruntime="false"> + <javac srcdir="${main.java}" destdir="${build.classes}" debug="true" source="1.6" target="1.6" includeantruntime="false"> <!-- need extra classpath for vmmagic --> <classpath> <pathelement path="${test.rvm.dir}/jksvm.jar"/> diff --git a/testing/tests/opttests/src/InvokeReflect.java b/testing/tests/opttests/src/InvokeReflect.java --- a/testing/tests/opttests/src/InvokeReflect.java +++ b/testing/tests/opttests/src/InvokeReflect.java @@ -28,7 +28,7 @@ // invoking methodToRun() in the class specified by arg System.out.println("**** START OF EXECUTION of " + arg + "." + methodToRun + " " + signatureToPrintOut + " ****."); - Class klass = Class.forName(arg); + Class<?> klass = Class.forName(arg); Method method = klass.getDeclaredMethod(methodToRun, noparams); Object result = method.invoke(null, (Object[])noparams); System.out.println("**** RESULT: " + result); |