@@ -215,11 +215,15 @@ if [ "$VERIFY_JRUBY" != "" ]; then "-Djruby.shell=$JRUBY_SHELL" \ org.jruby.Main $JRUBY_OPTS "$@" + # Record the exit status immediately, or it will be overridden. + JRUBY_STATUS=$? + if [ "$PROFILE_ARGS" != "" ]; then echo "Profiling results:" - cat profile.txt fi + + exit $JRUBY_STATUS else exec "$JAVA_CMD" $JAVA_OPTS "${java_args[@]}" -Xbootclasspath/a:"$JRUBY_CP" -classpath "$CP$CP_DELIMETER$CLASSPATH" \ "-Djruby.home=$JRUBY_HOME" \ @@ -227,3 +231,6 @@ else "-Djruby.shell=$JRUBY_SHELL" \ org.jruby.Main $JRUBY_OPTS "$@" fi + +# Be careful adding code down here, you might override the exit +# status of the jruby invocation. bin/jruby @@ -777,18 +777,29 @@ <delete file="${build.dir}/mspec.tgz"/> <delete file="${spec.dir}/rubyspecs.current.revision"/> </target> - - <target name="run-specs" depends="jar"> - <antcall target="run-specs-precompiled"/> - <antcall target="run-specs-compiled"/> - <antcall target="run-specs-interpreted"/> + + <target name="run-specs" depends="run-specs-precompiled, run-specs-compiled, run-specs-interpreted, jar"> + <condition property="spec.status.combined.OK"> + <and> + <equals arg1="${spec.status.PRECOMPILED}" arg2="0"/> + <equals arg1="${spec.status.COMPILED}" arg2="0"/> + <equals arg1="${spec.status.INTERPRETED}" arg2="0"/> + </and> + </condition> + <fail message="RubySpecs FAILED" unless="spec.status.combined.OK"/> </target> <target name="run-specs-all" depends="jar"><antcall target="run-specs-all-precompiled"/></target> - <target name="run-specs-compiled"><_run_specs_internal compile.mode="JIT" jit.threshold="0"/></target> - <target name="run-specs-precompiled"><_run_specs_internal compile.mode="FORCE" jit.threshold="0"/></target> - <target name="run-specs-interpreted"><_run_specs_internal/></target> + <target name="run-specs-compiled" depends="jar"> + <_run_specs_internal mode.name="COMPILED" compile.mode="JIT" jit.threshold="0"/> + </target> + <target name="run-specs-precompiled" depends="jar"> + <_run_specs_internal mode.name="PRECOMPILED" compile.mode="FORCE" jit.threshold="0"/> + </target> + <target name="run-specs-interpreted" depends="jar"> + <_run_specs_internal mode.name="INTERPRETED" compile.mode="OFF"/> + </target> <target name="run-specs-all-interpreted"><_run_specs_all_internal compile.mode="OFF"/></target> <target name="run-specs-all-precompiled"><_run_specs_all_internal compile.mode="FORCE" jit.threshold="0"/></target> @@ -834,12 +845,13 @@ <attribute name="objectspace.enabled" default="true"/> <attribute name="thread.pooling" default="false"/> <attribute name="reflection" default="false"/> + <attribute name="mode.name"/> <element name="extra-args" optional="true"/> <sequential> <echo message="compile=@{compile.mode}, threshold=@{jit.threshold}, objectspace=@{objectspace.enabled} threadpool=@{thread.pooling} reflection=@{reflection}"/> - <java classname="org.jruby.Main" fork="true" maxmemory="${jruby.launch.memory}" failonerror="true" dir="${base.dir}"> + <java classname="org.jruby.Main" fork="true" maxmemory="${jruby.launch.memory}" failonerror="false" resultproperty="spec.status.@{mode.name}" dir="${base.dir}"> <classpath refid="build.classpath"/> <classpath path="${jruby.classes.dir}"/> @@ -875,10 +887,12 @@ <macrodef name="_run_specs_internal"> <attribute name="compile.mode" default="OFF"/> <attribute name="jit.threshold" default="20"/> + <attribute name="mode.name"/> <sequential> <echo message="Excludes: ${spec.tags.dir}"/> - <run-specs compile.mode="@{compile.mode}" jit.threshold="@{jit.threshold}"/> + <run-specs mode.name="@{mode.name}" + compile.mode="@{compile.mode}" jit.threshold="@{jit.threshold}"/> </sequential> </macrodef> build.xml f276ccf1b9f179b0eeb11c7d481c66fa3cb93c88 vvs vvs@961051c9-f516-0410-bf72-c9f7e237a7b7 http://github.com/bobmcwhirter/jruby/commit/e0b37f9708da67078c70c5c32be8b2c039cf8861 e0b37f9708da67078c70c5c32be8b2c039cf8861 2008-08-04T14:30:05-07:00 2008-08-04T14:30:05-07:00 JRUBY-2894: When spec runs fail, Ant is not terminating with a failure message. * The reason why mspec invocation didn't return failed status is due to JRuby launcher bash script overwriting the exit status when -J-ea was set. * Also, make Ant run RubySpecs in all three modes even if some of them fail, and then return the combined result. git-svn-id: http://svn.codehaus.org/jruby/trunk/jruby@7375 961051c9-f516-0410-bf72-c9f7e237a7b7 b1afc6474db477ffa0738d0edb5e4ded2b8f7b34 vvs vvs@961051c9-f516-0410-bf72-c9f7e237a7b7