From 33951fe3d2e6d118d6798039c24afdcf2cd4f6de Mon Sep 17 00:00:00 2001 From: Christoph Galuschka Date: Dec 24 2011 21:31:34 +0000 Subject: minor changes: removed unnecessary if-clause in gcc-test minor wording changes to phpinfo()-test --- diff --git a/tests/p_freeradius/0-install_freeradius.sh b/tests/p_freeradius/0-install_freeradius.sh index 0111021..9723d84 100755 --- a/tests/p_freeradius/0-install_freeradius.sh +++ b/tests/p_freeradius/0-install_freeradius.sh @@ -23,8 +23,8 @@ if (t_GetPkgRel basesystem | grep -q el6) then t_ServiceControl radiusd start else - # C5 has an eap-setting in radiusd.conf and 3 "sites-available" which prevent successfull start (probably missing some dep) - # as the basic test works without these, the eap settings and 2 sites-available will be removed for the test and later restored + # C5 has an eap-setting in radiusd.conf and 3 "sites-enabled" which prevent successfull start (probably missing some dep) + # as the basic test works without these, the eap settings and 2 sites-enabled will be removed for the test and later restored # Check if we allready did this if [ ! -e /etc/raddb/radiusd.conf.orig ] then diff --git a/tests/p_gcc/test_gcc.sh b/tests/p_gcc/test_gcc.sh index 24a19b4..e1932e9 100755 --- a/tests/p_gcc/test_gcc.sh +++ b/tests/p_gcc/test_gcc.sh @@ -20,18 +20,11 @@ EOF gcc $FILE -o $EXE # run EXE -WORKING=$( $EXE |grep -c 'hello, centos') - -if [ $WORKING -eq 1 ] -then - ret_val=0 -else - ret_val=1 -fi +$EXE |grep -cq 'hello, centos' +t_CheckExitStatus $? # remove files /bin/rm $FILE /bin/rm $EXE -t_CheckExitStatus $ret_val diff --git a/tests/p_php/10-php-test.sh b/tests/p_php/10-php-test.sh index af909e4..82f57bc 100755 --- a/tests/p_php/10-php-test.sh +++ b/tests/p_php/10-php-test.sh @@ -2,9 +2,8 @@ # Author: Athmane Madjoudj # Author: Christoph Galuschka -t_Log "Running $0 - php phpinfo() function test." +t_Log "Running $0 - php test: looking for Zend Engine in phpinfo()." -# Comparing hostname with output of phpinfo() FILE='/var/tmp/php-test.php' cat > $FILE <