Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 1fa336b

Browse files
headiusheadius
committed
Remove invokedynamic-specific targets from build.xml.
1 parent 78dc4c1 commit 1fa336b

File tree

1 file changed

+0
-80
lines changed

1 file changed

+0
-80
lines changed

‎build.xml‎

Lines changed: 0 additions & 80 deletions
Original file line numberDiff line numberDiff line change
@@ -845,14 +845,6 @@
845845
description="Runs unit tests.">
846846
</target>
847847

848-
<target name="test-indy" depends="
849-
copy-test-files,
850-
install-gems,
851-
run-junit-indy-short,
852-
test-rake-targets"
853-
description="Runs unit tests.">
854-
</target>
855-
856848
<target name="test-extended" depends="
857849
copy-test-files,
858850
install-gems,
@@ -893,8 +885,6 @@
893885
<target name="run-junit-compiled"><run-junit-1.8 compile.mode="JIT" jit.threshold="0"/></target>
894886
<target name="run-junit-compiled-short"><run-junit-1.8-short compile.mode="JIT" jit.threshold="0"/></target>
895887
<target name="run-junit-interpreted-short"><run-junit-1.8-short/></target>
896-
<target name="run-junit-indy-short"><run-junit-1.8-indy-short/></target>
897-
<!-- temporarily disabled during compiler work -->
898888
<target name="run-junit-compiled-1.9"><run-junit-1.9 compile.mode="JIT" jit.threshold="0"/></target>
899889
<target name="run-junit-reflected-compiled"><run-junit-1.8 compile.mode="JIT" jit.threshold="0" reflection="true"/></target>
900890
<target name="run-junit-reflected-compiled-1.9"><run-junit-1.9 compile.mode="JIT" jit.threshold="0" reflection="true"/></target>
@@ -920,61 +910,6 @@
920910
<pathelement location="${test.dir}"/>
921911
</path>
922912

923-
<macrodef name="run-junit-indy">
924-
<attribute name="jruby.version" default="ruby1_8"/>
925-
<attribute name="compile.mode" default="-X+O"/>
926-
<attribute name="jit.threshold" default="0"/>
927-
<attribute name="jit.maxsize" default="1000000000"/>
928-
<attribute name="jit.max" default="-1"/>
929-
<attribute name="objectspace.enabled" default="true"/>
930-
<attribute name="thread.pooling" default="false"/>
931-
<attribute name="reflection" default="false"/>
932-
<element name="junit-tests"/>
933-
<sequential>
934-
<echo message="compile=@{compile.mode}, jit.threshold=@{jit.threshold}, jit.maxsize=@{jit.maxsize}, jit.max=@{jit.max}, objectspace=@{objectspace.enabled} threadpool=@{thread.pooling} reflection=@{reflection} version=@{jruby.version}"/>
935-
<taskdef name="junit" classname="org.apache.tools.ant.taskdefs.optional.junit.JUnitTask" classpath="${build.lib.dir}/junit.jar"/>
936-
937-
<junit jvm="${jruby.test.jvm}" fork="yes" forkMode="once" haltonfailure="true" dir="${basedir}" maxmemory="${jruby.test.memory}" showoutput="true" timeout="1800000">
938-
<classpath refid="test.class.path"/>
939-
940-
<sysproperty key="jruby.compile.invokedynamic" value="true"/>
941-
<sysproperty key="java.awt.headless" value="true"/>
942-
<sysproperty key="jruby.home" value="${basedir}"/>
943-
<sysproperty key="jruby.lib" value="${lib.dir}"/>
944-
<sysproperty key="jruby.compile.mode" value="@{compile.mode}"/>
945-
<sysproperty key="jruby.jit.threshold" value="@{jit.threshold}"/>
946-
<sysproperty key="jruby.jit.maxsize" value="@{jit.maxsize}"/>
947-
<sysproperty key="jruby.jit.max" value="@{jit.max}"/>
948-
<sysproperty key="jruby.compat.version" value="@{jruby.version}"/>
949-
<sysproperty key="jruby.objectspace.enabled" value="@{objectspace.enabled}"/>
950-
<sysproperty key="jruby.thread.pool.enabled" value="@{thread.pooling}"/>
951-
<sysproperty key="jruby.reflection" value="@{reflection}"/>
952-
<sysproperty key="jruby.jit.logging.verbose" value="true"/>
953-
<sysproperty key="jruby.compile.lazyHandles" value="true"/>
954-
955-
<!-- emma coverage tool properties -->
956-
<sysproperty key="emma.coverage.out.file" value="${test.results.dir}/coverage.emma" />
957-
<sysproperty key="emma.coverage.out.merge" value="true" />
958-
<sysproperty key="emma.verbosity.level" value="silent" />
959-
960-
<syspropertyset refid="test.sysproperties"/>
961-
962-
<!-- force client VM to improve test run times AND -->
963-
<!-- set a larger max permgen, since the tests load a lot of bytecode -->
964-
<jvmarg line="-ea ${java.opts} -client -XX:MaxPermSize=256M -XX:+UnlockExperimentalVMOptions -XX:+EnableMethodHandles -XX:+EnableInvokeDynamic"/>
965-
966-
<formatter type="xml"/>
967-
<formatter type="brief" usefile="false" />
968-
969-
<junit-tests/>
970-
</junit>
971-
<junitreport todir="${test.results.dir}">
972-
<fileset dir="${test.results.dir}" includes="TEST-*.xml"/>
973-
<report format="frames" todir="${html.test.results.dir}"/>
974-
</junitreport>
975-
</sequential>
976-
</macrodef>
977-
978913
<macrodef name="run-junit">
979914
<attribute name="jruby.version" default="ruby1_8"/>
980915
<attribute name="compile.mode" default="OFF"/>
@@ -1053,21 +988,6 @@
1053988
</sequential>
1054989
</macrodef>
1055990

1056-
<!-- runs junit tests for 1.8 functionality -->
1057-
<macrodef name="run-junit-1.8-indy-short">
1058-
<sequential>
1059-
<run-junit-indy>
1060-
<junit-tests>
1061-
<test name="${test}" if="test"/>
1062-
<test name="org.jruby.test.ScriptTestSuite" todir="${test.results.dir}" unless="test"/>
1063-
<test name="org.jruby.test.JRubyTestSuite" todir="${test.results.dir}" unless="test"/>
1064-
<test name="org.jruby.test.MRITestSuite" todir="${test.results.dir}" unless="test"/>
1065-
<test name="org.jruby.test.MainTestSuite" todir="${test.results.dir}" unless="test"/>
1066-
</junit-tests>
1067-
</run-junit-indy>
1068-
</sequential>
1069-
</macrodef>
1070-
1071991
<!-- runs junit tests for 1.8 functionality -->
1072992
<macrodef name="run-junit-1.8">
1073993
<attribute name="compile.mode" default="OFF"/>

0 commit comments

Comments
 (0)