From a4f4f3147850706f0c0a6738da4f9002fc84c1b0 Mon Sep 17 00:00:00 2001 From: Fabian Arrotin Date: May 20 2014 06:39:06 +0000 Subject: Fixed all ruby specific version checks for el7 --- diff --git a/tests/p_ruby/20-ruby-version-test.sh b/tests/p_ruby/20-ruby-version-test.sh index 2d26359..7ff529f 100755 --- a/tests/p_ruby/20-ruby-version-test.sh +++ b/tests/p_ruby/20-ruby-version-test.sh @@ -6,8 +6,11 @@ # Christoph Galuschka t_Log "Running $0 - Check version of ruby." -if [ $centos_ver = 6 ] - then + +if [ "$centos_ver" = "7" ] ; then + ruby -v | grep -q '2.0' + ret_val=$? +elif [ "$centos_ver" = "6" ] ; then ruby -v | grep -q '1.8.7' ret_val=$? else diff --git a/tests/p_ruby/30-irb-version-test.sh b/tests/p_ruby/30-irb-version-test.sh index 12311f4..ac7a88e 100755 --- a/tests/p_ruby/30-irb-version-test.sh +++ b/tests/p_ruby/30-irb-version-test.sh @@ -8,9 +8,8 @@ t_Log "Running $0 - Check version of irb." #allready prepared just in case versions should change between C5 and C6 -if [ $centos_ver = 5 ] - then - irb -v | grep -q '0.9.5' +if [ "$centos_ver" = "7" ] ; then + irb -v | grep -q '0.9.6' ret_val=$? else irb -v | grep -q '0.9.5' diff --git a/tests/p_ruby/40-ri-version-test.sh b/tests/p_ruby/40-ri-version-test.sh index 017fb76..75acf70 100755 --- a/tests/p_ruby/40-ri-version-test.sh +++ b/tests/p_ruby/40-ri-version-test.sh @@ -8,9 +8,8 @@ t_Log "Running $0 - Check version of ruby ri." #allready prepared just in case versions should change between C5 and C6 -if [ $centos_ver = 5 ] - then - ri -v | grep -q '1.0.1' +if [ "$centos_ver" = "7" ] ; then + ri -v | grep -q '4.0' ret_val=$? else ri -v | grep -q '1.0.1' diff --git a/tests/p_ruby/50-rdoc-version-test.sh b/tests/p_ruby/50-rdoc-version-test.sh index 986b4c3..cf7a440 100755 --- a/tests/p_ruby/50-rdoc-version-test.sh +++ b/tests/p_ruby/50-rdoc-version-test.sh @@ -8,10 +8,10 @@ t_Log "Running $0 - Check version of rdoc." #allready prepared just in case versions should change between C5 and C6 -if [ $centos_ver = 5 ] - then - rdoc -v | grep -q '1.0.1' - ret_val=$? +if [ "$centos_ver" = "7" ] ; then + t_Log "CentOS $centos_ver rdoc has no version in cli -> SKIP" + t_CheckExitStatus 0 + exit 0 else rdoc -v | grep -q '1.0.1' ret_val=$?