RFC: CACAO ignore all unknown options

[Dr Andrew John Hughes]

On 01:40 Fri 04 Mar     , Xerxes Rånby wrote:
> CACAO currently do not pass most jtreg tests because CACAO stop on any 
> unknown option, prints its usage, and then return with exit code: 1.
> 
> This are the main reason why CACAO make check-hotspot currently fails 
> most of the tests: Test results: passed: 29; failed: 78
> 
> For example CACAO currently fail hotspot/test/compiler/7009359 due to 
> the Unknown option: -Xbatch
> command: main  -Xbatch -XX:+IgnoreUnrecognizedVMOptions 
> -XX:+OptimizeStringConcat 
> -XX:CompileCommand=exclude,Test7009359,mainTest7009359
> ----------System.out:(34/1763)----------
> Unknown option: -Xbatch
> Usage: cacao [-options] classname [arguments]
>                 (to run a class file)
> ...
> ----------System.err:(3/163)----------
> Unknown -XX option: -XX:+IgnoreUnrecognizedVMOptions
> Unknown -XX option: -XX:+OptimizeStringConcat
> Unknown -XX option: -XX:CompileCommand=exclude,Test7009359,main
> result: Failed. Unexpected exit from test [exit code: 1]
> 
> 
> The attached patch fixes this by letting CACAO continue after it have 
> reported the Unknown option to System.err.
> 
> Ok to push?
> 
> 
> With this patch applied the remaining failing CACAO check-hotspot tests 
> are now reduced to a handful, here testing on a amd64 box:
> 
> Error:  compiler/6589834/Test_ia32.java
> FAILED: compiler/6987555/Test6987555.java
> FAILED: compiler/6991596/Test6991596.java
> FAILED: gc/6581734/Test6581734.java
> FAILED: runtime/6626217/Test6626217.sh
> FAILED: runtime/6929067/Test6929067.sh
> FAILED: runtime/6981737/Test6981737.java
> 
> Test results: passed: 100; failed: 6; error: 1
> 
> Cheers
> Xerxes

Looks good to me.  Have you looked into upstreaming this and the similar JamVM change?

> Index: icedtea6/Makefile.am
> ===================================================================
> --- icedtea6.orig/Makefile.am	2011-03-04 01:00:36.000000000 +0100
> +++ icedtea6/Makefile.am	2011-03-04 01:01:26.000000000 +0100
> @@ -347,7 +347,8 @@
>  	patches/cacao/launcher.patch \
>  	patches/cacao/arm-arch-defines.patch \
>  	patches/cacao/jsig.patch \
> -	patches/cacao/memory.patch
> +	patches/cacao/memory.patch \
> +	patches/cacao/ignore-unknown-options.patch
>  endif
>  
>  if ENABLE_CACAO
> Index: icedtea6/patches/cacao/ignore-unknown-options.patch
> ===================================================================
> --- /dev/null	1970-01-01 00:00:00.000000000 +0000
> +++ icedtea6/patches/cacao/ignore-unknown-options.patch	2011-03-04 01:13:38.000000000 +0100
> @@ -0,0 +1,17 @@
> +Index: cacao/cacao/src/vm/vm.cpp
> +===================================================================
> +--- cacao.orig/cacao/src/vm/vm.cpp	2011-03-04 00:20:24.000000000 +0100
> ++++ cacao/cacao/src/vm/vm.cpp	2011-03-04 01:12:45.000000000 +0100
> +@@ -1239,9 +1239,10 @@
> + 
> + #endif
> + 		default:
> +-			printf("Unknown option: %s\n",
> ++			fprintf(stderr,"Unknown option: %s\n",
> + 				   vm_args->options[opt_index].optionString);
> +-			usage();
> ++			opt_index++;
> ++			/* Ignore */
> + 		}
> + 	}
> + 


-- 
Andrew :)

Free Java Software Engineer
Red Hat, Inc. (http://www.redhat.com)

Support Free Java!
Contribute to GNU Classpath and IcedTea
http://www.gnu.org/software/classpath
http://icedtea.classpath.org
PGP Key: F5862A37 (https://keys.indymedia.org/)
Fingerprint = EA30 D855 D50F 90CD F54D  0698 0713 C3ED F586 2A37