From 9b87af36e964edde597b33abe3b9cab298498705 Mon Sep 17 00:00:00 2001
From: Athmane Madjoudj <athmanem@gmail.com>
Date: Nov 17 2011 15:07:34 +0000
Subject: Skip rrdtool on C5 and remove minicom test (diff versions on c5/c6)


---

diff --git a/tests/p_minicom/minicom_test.sh b/tests/p_minicom/minicom_test.sh
deleted file mode 100755
index be6b482..0000000
--- a/tests/p_minicom/minicom_test.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh
-# Author: Athmane Madjoudj <athmanem@gmail.com>
-# Author: Christph Galuschka <christoph.galuschka@tiwag.at>
-
-t_Log "Running $0 - very basic minicom test."
-
-# Only checking for correct output of '-v'
-
-VERSION="2.3"
-
-minicom -v | grep "${CHECK_FOR}"  >/dev/null 2>&1
-
-t_CheckExitStatus $?
diff --git a/tests/p_rrdtool/0-install_rrdtool.sh b/tests/p_rrdtool/0-install_rrdtool.sh
index a863f6e..edc2896 100755
--- a/tests/p_rrdtool/0-install_rrdtool.sh
+++ b/tests/p_rrdtool/0-install_rrdtool.sh
@@ -1,7 +1,12 @@
 #!/bin/bash
 # Author: Christoph Galuschka <christoph.galuschka@tiwag.at>
+#         Athmane Madjoudj <athmanem@gmail.com>
 
-# Install rrdtool
-t_InstallPackage rrdtool
-
+if (t_GetPkgRel basesystem | grep -q el6)
+then
+    # Install rrdtool
+    t_InstallPackage rrdtool
+else 
+    echo "Skipped on CentOS 5"
+fi
 
diff --git a/tests/p_rrdtool/rrdtool_test.sh b/tests/p_rrdtool/rrdtool_test.sh
index fe77a55..7b28a65 100755
--- a/tests/p_rrdtool/rrdtool_test.sh
+++ b/tests/p_rrdtool/rrdtool_test.sh
@@ -3,25 +3,30 @@
 # Author: Christph Galuschka <christoph.galuschka@tiwag.at>
 # RRD-sample from http://oss.oetiker.ch/rrdtool/doc/rrdcreate.en.html
 
-t_Log "Running $0 - basic rrdtool test."
+if (t_GetPkgRel basesystem | grep -q el6)
 
-# creating test RRD
+    t_Log "Running $0 - basic rrdtool test."
 
-FILE="/var/tmp/temperature.rrd"
+    # creating test RRD
 
-rrdtool create $FILE --step 1 DS:temp:GAUGE:600:-273:5000 RRA:AVERAGE:0.5:1:1200
+    FILE="/var/tmp/temperature.rrd"
 
-# insert value
-rrdtool update $FILE N:30
+    rrdtool create $FILE --step 1 DS:temp:GAUGE:600:-273:5000 RRA:AVERAGE:0.5:1:1200
 
-# retrieve value and check
-WORKING=$(rrdtool fetch $FILE AVERAGE -s -80 |grep -c '3.0000000000e+01')
+    # insert value
+    rrdtool update $FILE N:30
 
-# if $WORKING > 0 -> update and retrieval works
-if [ $WORKING > 0 ]; then ret_val=0;
-fi
+    # retrieve value and check
+    WORKING=$(rrdtool fetch $FILE AVERAGE -s -80 |grep -c '3.0000000000e+01')
+
+    # if $WORKING > 0 -> update and retrieval works
+    if [ $WORKING > 0 ]; then ret_val=0;
+    fi
 
-#remove RRD-File
-/bin/rm $FILE
+    #remove RRD-File
+    /bin/rm $FILE
 
-t_CheckExitStatus $ret_val
+    t_CheckExitStatus $ret_val
+else
+    echo "Skipped on CentOS 5"
+fi