From 600c8209b8787e23760b260b623fef2cde7b9bc8 Mon Sep 17 00:00:00 2001 From: Karanbir Singh Date: Nov 15 2012 09:04:52 +0000 Subject: moving the base common flags to the runtests.sh since they are used there, and might not get setup if the lib/functions.sh script is broken --- diff --git a/runtests.sh b/runtests.sh index 6f4fe6b..257d2aa 100755 --- a/runtests.sh +++ b/runtests.sh @@ -12,8 +12,11 @@ export SKIP_QA_HARNESS=$? LIB_FUNCTIONS='./tests/0_lib/functions.sh' -# Just in case $LIB_FUNCTIONS doesn't exist -export FAIL=1 +# Human friendly symbols +export readonly PASS=0 +export readonly FAIL=1 +# set debug level of yum install in t_InstallPackage +export YUMDEBUG=0 [ -f $LIB_FUNCTIONS ] && source $LIB_FUNCTIONS || { echo -e "\n[+] `date` -> Unable to source functions library. Cannot continue\n"; exit $FAIL; } diff --git a/tests/0_lib/functions.sh b/tests/0_lib/functions.sh index ab7b82a..24847bd 100755 --- a/tests/0_lib/functions.sh +++ b/tests/0_lib/functions.sh @@ -1,11 +1,5 @@ #!/bin/bash -# Human friendly symbols -export readonly PASS=0 -export readonly FAIL=1 - -# set debug level of yum install in t_InstallPackage -export YUMDEBUG=0 # Description: call this function whenever you need to log output (preferred to calling echo) # Arguments: log string to display