X-Git-Url: http://nitlanguage.org

diff --git a/benchmarks/bench_engines.sh b/benchmarks/bench_engines.sh
index 3bdce85..ae91703 100755
--- a/benchmarks/bench_engines.sh
+++ b/benchmarks/bench_engines.sh
@@ -62,6 +62,7 @@ function run_compiler()
 		run_command "$@" ../src/nit.nit -o "nit.$title.bin"
 		bench_command "nit-queens" "nit queens.nit 8" "./nit.$title.bin" ../lib/ai/examples/queens.nit -q 8
 		bench_command "nit-nitcc" "nit nitcc.nit calc.sablecc" "./nit.$title.bin" ../contrib/nitcc/src/nitcc.nit ../contrib/nitcc/examples/calc.sablecc
+		rm calc* 2> /dev/null # remove generated cruft
 		run_command "$@" ../src/nitdoc.nit -o "nitdoc.$title.bin"
 		rm -r out 2> /dev/null
 		mkdir out 2> /dev/null
@@ -186,10 +187,10 @@ function bench_nitc_options()
 	run_compiler "nitc-$name" ./nitc $common
 
 	if test "$1" = NOALL; then
+		withall=
 		shift
-	elif test -n "$2"; then
-		prepare_res "$name-all.dat" "all" "nitc-g with all options $@"
-		run_compiler "nitc-$name" ./nitc $common $@
+	else
+		withall=true
 	fi
 
 	for opt in "$@"; do
@@ -198,6 +199,11 @@ function bench_nitc_options()
 		run_compiler "nitc-$name" ./nitc $common $opt
 	done
 
+	if test -n "$2" -a -n "$withall"; then
+		prepare_res "$name-all.dat" "all" "nitc-g with all options $@"
+		run_compiler "nitc-$name" ./nitc $common $@
+	fi
+
 	plot "$name.gnu"
 }