update some test, diff with tolerance

Author: meihuisu

examples/programs/ucvm/run_ucvm_query_albacore.sh

@@ -9,6 +9,7 @@ source $UCVM_INSTALL_PATH/conf/ucvm_env.sh
 BIN_DIR=${UCVM_INSTALL_PATH}/bin
 CONF_DIR=${UCVM_INSTALL_PATH}/conf
 TEST_DIR=${UCVM_INSTALL_PATH}/tests/inputs
+DIFF=${UCVM_INSTALL_PATH}/utilities/ucvm_query_diff.sh
 MODEL=albacore
 
 expect=$(mktemp) || exit 1
@@ -71,7 +72,7 @@ Using Geo Depth coordinates as default mode.
 EOF_EXPECTED_RESULT
 
 echo "Running examples_programs_ucvm ucvm_query_albacore"
-if diff $result $expect > /dev/null 2>&1
+if $DIFF $result $expect > /dev/null 2>&1
 then
   echo [SUCCESS]
 else

examples/programs/ucvm/run_ucvm_query_albacore_c.sh

@@ -20,6 +20,7 @@ source $UCVM_INSTALL_PATH/conf/ucvm_env.sh
 BIN_DIR=${UCVM_INSTALL_PATH}/bin
 CONF_DIR=${UCVM_INSTALL_PATH}/conf
 TEST_DIR=${UCVM_INSTALL_PATH}/tests/inputs
+DIFF=${UCVM_INSTALL_PATH}/utilities/ucvm_query_diff.sh
 MODEL=albacore
 
 expect=$(mktemp) || exit 1
@@ -114,7 +115,7 @@ Using Geo Elevation coordinates as z mode.
 EOF_EXPECTED_RESULT
 
 echo "Running examples_programs_ucvm ucvm_query_albacore_c"
-if diff $result $expect > /dev/null 2>&1
+if $DIFF $result $expect > /dev/null 2>&1
 then
   echo [SUCCESS]
 else

examples/programs/ucvm/run_ucvm_query_canvas.sh

@@ -9,6 +9,7 @@ source $UCVM_INSTALL_PATH/conf/ucvm_env.sh
 BIN_DIR=${UCVM_INSTALL_PATH}/bin
 CONF_DIR=${UCVM_INSTALL_PATH}/conf
 TEST_DIR=${UCVM_INSTALL_PATH}/tests/inputs
+DIFF=${UCVM_INSTALL_PATH}/utilities/ucvm_query_diff.sh
 MODEL=canvas
 
 expect=$(mktemp) || exit 1
@@ -37,7 +38,7 @@ Using Geo Depth coordinates as default mode.
 EOF_EXPECTED_RESULT
 
 echo "Running examples_programs_ucvm ucvm_query_canvas"
-if diff $result $expect > /dev/null 2>&1
+if $DIFF $result $expect > /dev/null 2>&1
 then
   echo [SUCCESS]
 else

examples/programs/ucvm/run_ucvm_query_cca.sh

@@ -9,6 +9,7 @@ source $UCVM_INSTALL_PATH/conf/ucvm_env.sh
 BIN_DIR=${UCVM_INSTALL_PATH}/bin
 CONF_DIR=${UCVM_INSTALL_PATH}/conf
 TEST_DIR=${UCVM_INSTALL_PATH}/tests/inputs
+DIFF=${UCVM_INSTALL_PATH}/utilities/ucvm_query_diff.sh
 MODEL=cca
 
 expect=$(mktemp) || exit 1
@@ -53,7 +54,7 @@ Using Geo Depth coordinates as default mode.
 EOF_EXPECTED_RESULT
 
 echo "Running examples_programs_ucvm ucvm_query_cca"
-if diff $result $expect > /dev/null 2>&1
+if $DIFF $result $expect > /dev/null 2>&1
 then
   echo [SUCCESS]
 else

examples/programs/ucvm/run_ucvm_query_cca_c.sh

@@ -9,6 +9,7 @@ source $UCVM_INSTALL_PATH/conf/ucvm_env.sh
 BIN_DIR=${UCVM_INSTALL_PATH}/bin
 CONF_DIR=${UCVM_INSTALL_PATH}/conf
 TEST_DIR=${UCVM_INSTALL_PATH}/tests/inputs
+DIFF=${UCVM_INSTALL_PATH}/utilities/ucvm_query_diff.sh
 MODEL=cca
 
 expect=$(mktemp) || exit 1
@@ -76,7 +77,7 @@ Using Geo Elevation coordinates as z mode.
 EOF_EXPECTED_RESULT
 
 echo "Running examples_programs_ucvm ucvm_query_cca_c"
-if diff $result $expect > /dev/null 2>&1
+if $DIFF $result $expect > /dev/null 2>&1
 then
   echo [SUCCESS]
 else

examples/programs/ucvm/run_ucvm_query_cencal.sh

@@ -9,6 +9,7 @@ source $UCVM_INSTALL_PATH/conf/ucvm_env.sh
 BIN_DIR=${UCVM_INSTALL_PATH}/bin
 CONF_DIR=${UCVM_INSTALL_PATH}/conf
 TEST_DIR=${UCVM_INSTALL_PATH}/tests/inputs
+DIFF=${UCVM_INSTALL_PATH}/utilities/ucvm_query_diff.sh
 MODEL=cencal
 
 expect=$(mktemp) || exit 1
@@ -53,7 +54,7 @@ Using Geo Depth coordinates as default mode.
 EOF_EXPECTED_RESULT
 
 echo "Running examples_programs_ucvm ucvm_query_cencal"
-if diff $result $expect > /dev/null 2>&1
+if $DIFF $result $expect > /dev/null 2>&1
 then
   echo [SUCCESS]
 else

examples/programs/ucvm/run_ucvm_query_cencal_c.sh

@@ -9,6 +9,7 @@ source $UCVM_INSTALL_PATH/conf/ucvm_env.sh
 BIN_DIR=${UCVM_INSTALL_PATH}/bin
 CONF_DIR=${UCVM_INSTALL_PATH}/conf
 TEST_DIR=${UCVM_INSTALL_PATH}/tests/inputs
+DIFF=${UCVM_INSTALL_PATH}/utilities/ucvm_query_diff.sh
 MODEL=cencal
 
 expect=$(mktemp) || exit 1
@@ -73,7 +74,7 @@ Using Geo Elevation coordinates as z mode.
 EOF_EXPECTED_RESULT
 
 echo "Running examples_programs_ucvm ucvm_query_cencal_c"
-if diff $result $expect > /dev/null 2>&1
+if $DIFF $result $expect > /dev/null 2>&1
 then
   echo [SUCCESS]
 else

examples/programs/ucvm/run_ucvm_query_cencal_cvms.sh

@@ -9,6 +9,7 @@ source $UCVM_INSTALL_PATH/conf/ucvm_env.sh
 BIN_DIR=${UCVM_INSTALL_PATH}/bin
 CONF_DIR=${UCVM_INSTALL_PATH}/conf
 TEST_DIR=${UCVM_INSTALL_PATH}/tests/inputs
+DIFF=${UCVM_INSTALL_PATH}/utilities/ucvm_query_diff.sh
 MODEL=cencal,cvms
 
 expect=$(mktemp) || exit 1
@@ -197,7 +198,7 @@ Using Geo Depth coordinates as default mode.
 EOF_EXPECTED_RESULT
 
 echo "Running examples_programs_ucvm ucvm_query_cencal_cvms"
-if diff $result $expect > /dev/null 2>&1
+if $DIFF $result $expect > /dev/null 2>&1
 then
   echo [SUCCESS]
 else

examples/programs/ucvm/run_ucvm_query_cencal_cvms5.sh

@@ -9,6 +9,7 @@ source $UCVM_INSTALL_PATH/conf/ucvm_env.sh
 BIN_DIR=${UCVM_INSTALL_PATH}/bin
 CONF_DIR=${UCVM_INSTALL_PATH}/conf
 TEST_DIR=${UCVM_INSTALL_PATH}/tests/inputs
+DIFF=${UCVM_INSTALL_PATH}/utilities/ucvm_query_diff.sh
 MODEL=cencal,cvms5
 
 expect=$(mktemp) || exit 1
@@ -197,9 +198,8 @@ Using Geo Depth coordinates as default mode.
 EOF_EXPECTED_RESULT
 
 echo "Running examples_programs_ucvm ucvm_query_cencal_cvms5"
-cp $result oo
-diff $result $expect > ooo
-if diff $result $expect > /dev/null 2>&1
+
+if $DIFF $result $expect > /dev/null 2>&1
 then
   echo [SUCCESS]
 else

examples/programs/ucvm/run_ucvm_query_cs248.sh

@@ -9,6 +9,7 @@ source $UCVM_INSTALL_PATH/conf/ucvm_env.sh
 BIN_DIR=${UCVM_INSTALL_PATH}/bin
 CONF_DIR=${UCVM_INSTALL_PATH}/conf
 TEST_DIR=${UCVM_INSTALL_PATH}/tests/inputs
+DIFF=${UCVM_INSTALL_PATH}/utilities/ucvm_query_diff.sh
 MODEL=cs248
 
 expect=$(mktemp) || exit 1
@@ -39,7 +40,7 @@ Using Geo Depth coordinates as default mode.
 EOF_EXPECTED_RESULT
 
 echo "Running examples_programs_ucvm ucvm_query_cs248"
-if diff $result $expect > /dev/null 2>&1
+if $DIFF $result $expect > /dev/null 2>&1
 then
   echo [SUCCESS]
 else