From 6f0e3981c29beca7d83695ad8f5ab521b129771b Mon Sep 17 00:00:00 2001 From: Emmanuel Dreyfus Date: Sun, 19 Apr 2015 03:11:39 +0200 Subject: Tests: python portability Make sure to use $PYTHON defined from tests/env.rc so that we get the path to the actually detected python interpreter. Resubmit after rebase in hope that regression test will have less spurious failures. Backport of Ibf3e88f190d5e0c6a4a08e8d5ef9d0b5cba5078a BUG: 1212676 Change-Id: I0c39d1c64423c8c9b99f8abf8f8cd813ed6a0deb Signed-off-by: Emmanuel Dreyfus Reviewed-on: http://review.gluster.org/10287 Tested-by: Gluster Build System Reviewed-by: Vijay Bellur --- tests/geo-rep/geo-rep-helper.rc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tests/geo-rep/geo-rep-helper.rc b/tests/geo-rep/geo-rep-helper.rc index de8a6817305..400f88c53a6 100644 --- a/tests/geo-rep/geo-rep-helper.rc +++ b/tests/geo-rep/geo-rep-helper.rc @@ -60,7 +60,7 @@ function geo_rep_arequal_status() echo "calculating and comparing arequal checksum between $GMV0 and \ $GSV0 " >> $LOG_FILE - python $comp_arequal $H0::$GMV0 $H0::$GSV0 >> $LOG_FILE 2>&1 + $PYTHON $comp_arequal $H0::$GMV0 $H0::$GSV0 >> $LOG_FILE 2>&1 local ret=$? # There is a bug, where sometimes metadata checksum of directories @@ -97,7 +97,7 @@ function geo_rep_filecount_status() echo "calculating and comparing files count between $GMV0 and \ $GSV0 " >> $LOG_FILE - python $comp_arequal -c "find" $H0::$GMV0 $H0::$GSV0 >> $LOG_FILE 2>&1 + $PYTHON $comp_arequal -c "find" $H0::$GMV0 $H0::$GSV0 >> $LOG_FILE 2>&1 if [ $? -eq 0 ];then temp_status="completed" @@ -130,7 +130,7 @@ function check_status_arequal() echo "calculating and comparing gfids between $GMV0 and $GSV0 " \ >> $LOG_FILE - python $comp_gfid $H0::$GMV0 $H0::$GSV0 >> $LOG_FILE 2>&1 + $PYTHON $comp_gfid $H0::$GMV0 $H0::$GSV0 >> $LOG_FILE 2>&1 if [ $? != 0 ]; then return 1 @@ -140,7 +140,7 @@ function check_status_arequal() echo "calculating and comparing arequal checksum between $GMV0 and $GSV0 " \ >> $LOG_FILE - python $comp_arequal $H0::$GMV0 $H0::$GSV0 >> $LOG_FILE 2>&1 + $PYTHON $comp_arequal $H0::$GMV0 $H0::$GSV0 >> $LOG_FILE 2>&1 local rett=$? @@ -165,12 +165,12 @@ function create_data() if [ $DIR_STR == "MULTI" ];then - python $create_data -n $nf --multi -b 10 -d 10 --random --max=2K \ + $PYTHON $create_data -n $nf --multi -b 10 -d 10 --random --max=2K \ --min=1K -t $FILE_TYPE --fop=$fop $MNT_PNT >> $LOG_FILE 2>&1 elif [ $DIR_STR == "SINGLE" ];then - python $create_data -n $ns --random --max=2K --min=1K -t $FILE_TYPE \ + $PYTHON $create_data -n $ns --random --max=2K --min=1K -t $FILE_TYPE \ --fop=$fop $MNT_PNT >> $LOG_FILE 2>&1 else -- cgit