From: thurston <thurston@052ea7fc-9027-0410-9066-f65837a77df0>
Date: Thu, 5 Apr 2007 03:48:55 +0000 (+0000)
Subject: The runtests script was improved so that the Java and Ruby test cases don't
X-Git-Tag: 2.0_alpha~328
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=aba03bbd34b67f3e0f403081a1901a20e1903988;p=external%2Fragel.git

The runtests script was improved so that the Java and Ruby test cases don't
need ALLOW_GENFLAGS set.


git-svn-id: http://svn.complang.org/ragel/trunk@167 052ea7fc-9027-0410-9066-f65837a77df0
---

diff --git a/test/atoi3.rl b/test/atoi3.rl
index 463f307..a4b9387 100644
--- a/test/atoi3.rl
+++ b/test/atoi3.rl
@@ -1,6 +1,5 @@
 #
 # @LANG: ruby
-# @ALLOW_GENFLAGS: -T0
 #
 
 neg = false
diff --git a/test/export2.rl b/test/export2.rl
index 198e10c..881a4c9 100644
--- a/test/export2.rl
+++ b/test/export2.rl
@@ -1,6 +1,5 @@
 /*
  * @LANG: java
- * @ALLOW_GENFLAGS: -T0
  */
 
 class export2
diff --git a/test/export3.rl b/test/export3.rl
index b5aef99..c0dde02 100644
--- a/test/export3.rl
+++ b/test/export3.rl
@@ -1,6 +1,5 @@
 #
 # @LANG: ruby
-# @ALLOW_GENFLAGS: -T0
 #
 
 %%{
diff --git a/test/java1.rl b/test/java1.rl
index 128386f..461d177 100644
--- a/test/java1.rl
+++ b/test/java1.rl
@@ -1,6 +1,5 @@
 /*
  * @LANG: java
- * @ALLOW_GENFLAGS: -T0
  */
 
 class java1
diff --git a/test/java2.rl b/test/java2.rl
index 61d9ac9..f308902 100644
--- a/test/java2.rl
+++ b/test/java2.rl
@@ -1,6 +1,5 @@
 /*
  * @LANG: java
- * @ALLOW_GENFLAGS: -T0
  */
 
 class java2
diff --git a/test/langtrans_java.sh b/test/langtrans_java.sh
index bc7e1f4..982be78 100755
--- a/test/langtrans_java.sh
+++ b/test/langtrans_java.sh
@@ -14,7 +14,6 @@ sed -n '/\/\*/,/\*\//d;p' $file | txl -q stdin langtrans_java.txl - $class > $fi
 cat << EOF
 /*
  * @LANG: java
- * @ALLOW_GENFLAGS: -T0
  * @GENERATED: yes
  */
 
diff --git a/test/langtrans_ruby.sh b/test/langtrans_ruby.sh
index bdc6802..1e22bd0 100755
--- a/test/langtrans_ruby.sh
+++ b/test/langtrans_ruby.sh
@@ -16,7 +16,6 @@ sed -n '/\/\*/,/\*\//d;p' $file | txl -q stdin langtrans_ruby.txl > $file.pr
 cat << EOF
 #
 # @LANG: ruby
-# @ALLOW_GENFLAGS: -T0
 # @GENERATED: yes
 #
 
diff --git a/test/runtests b/test/runtests
index 9dd7acf..4327ddd 100755
--- a/test/runtests
+++ b/test/runtests
@@ -20,7 +20,7 @@
 #   along with Ragel; if not, write to the Free Software
 #   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA 
 
-while getopts "gcnmleT:F:G:P:CDJ" opt; do
+while getopts "gcnmleT:F:G:P:CDJR" opt; do
 	case $opt in
 		T|F|G|P) 
 			genflags="$genflags -$opt$OPTARG"
@@ -98,55 +98,58 @@ for test_case; do
 
 	case $lang in
 		c++)
+			lang_opt=-C;
 			codegen=../rlgen-cd/rlgen-cd;
 			code_suffix=cpp;
 			compiler=$cxx_compiler;
-			lang_opt=-C;
 			cflags="-pedantic -ansi -Wall -O3"
 		;;
 		d)
+			lang_opt=-D;
 			codegen=../rlgen-cd/rlgen-cd;
 			code_suffix=d;
 			compiler=$d_compiler;
-			lang_opt=-D;
 			cflags="-Wall -O3"
 		;;
 		c)
+			lang_opt=-C;
 			codegen=../rlgen-cd/rlgen-cd;
 			code_suffix=c;
 			compiler=$c_compiler;
-			lang_opt=-C;
 			cflags="-pedantic -ansi -Wall -O3"
 		;;
 		obj-c)
+			lang_opt=-C;
 			codegen=../rlgen-cd/rlgen-cd;
 			code_suffix=m;
 			compiler=$objc_compiler
-			lang_opt=-C;
 			cflags="-Wall -O3 -fno-strict-aliasing -lobjc"
 		;;
 		java)
+			lang_opt=-J;
 			codegen=../rlgen-java/rlgen-java;
 			code_suffix=java;
 			compiler=$java_compiler
-			lang_opt=-J;
 			cflags=""
 		;;
 		ruby)
+			lang_opt=-R;
 			codegen=../rlgen-ruby/rlgen-ruby;
 			code_suffix=rb;
 			compiler=$ruby_engine
-			lang_opt=-R;
 			cflags=""
 		;;
 		indep)
-			# If we have no compiler for the source program then skip it.
+			lang_opt="";
+
+			# If we have no txl engine then skip this test.
 			[ -z "$txl_engine" ] && continue
-			for lang in c d java; do
+			for lang in c d java ruby; do
 				case $lang in 
 					c) lf="-C";;
 					d) lf="-D";;
 					java) lf="-J";;
+					ruby) lf="-R";;
 				esac
 
 				echo "$langflags" | grep -e $lf >/dev/null || continue
@@ -185,9 +188,21 @@ for test_case; do
 	allow_minflags=`sed '/@ALLOW_MINFLAGS:/s/^.*: *//p;d' $test_case`
 	[ -z "$allow_minflags" ] && allow_minflags="-n -m -l -e"
 
-	allow_genflags=`sed '/@ALLOW_GENFLAGS:/s/^.*: *//p;d' $test_case`
-	[ -z "$allow_genflags" ] && allow_genflags="-T0 -T1 -F0 -F1 -G0 -G1 -G2"
 
+	# If we are in java or ruby then we are not interested in genflags
+	case $lang in
+	c|c++|objc|d)
+		# Using genflags, get the allowed gen flags from the test case. If the
+		# test case doesn't specify assume that all gen flags are allowed.
+		allow_genflags=`sed '/@ALLOW_GENFLAGS:/s/^.*: *//p;d' $test_case`
+		[ -z "$allow_genflags" ] && allow_genflags="-T0 -T1 -F0 -F1 -G0 -G1 -G2"
+	;;
+	*)
+		# Not interested in gen flags.
+		allow_genflags=noflags
+		genflags=noflags
+	;;
+	esac
 
 	for min_opt in $minflags; do
 		for gen_opt in $genflags; do
@@ -200,7 +215,7 @@ for test_case; do
 			fi
 			echo "$allow_genflags" | grep -e $grep_gen_opt >/dev/null || continue
 
-			if [ $lang == "java" ] || [ $lang == "ruby" ]; then
+			if [ $genflags == noflags ]; then
 				be_gen_opt=""
 			else
 				be_gen_opt=$gen_opt