From f454da70f50862cbcb8d79f4ae795be26cdd9437 Mon Sep 17 00:00:00 2001
From: Juergen Knoedlseder <jurgen.knodlseder@irap.omp.eu>
Date: Wed, 11 Jul 2012 23:35:41 +0200
Subject: [PATCH] Avoid using of sh builtin echo command.

---
 test/test_cscripts.sh.in | 33 +++++++++++++++++++--------------
 test/test_ctools.sh      | 67 ++++++++++++++++++++++++++++++++++++-------------------------------
 2 files changed, 55 insertions(+), 45 deletions(-)

diff --git a/test/test_cscripts.sh.in b/test/test_cscripts.sh.in
index d255a11..552f6ef 100755
--- a/test/test_cscripts.sh.in
+++ b/test/test_cscripts.sh.in
@@ -20,12 +20,17 @@
 # ==========================================================================
 
 #
+# Get echo command (to circumvent built-in echo on some systems)
+#
+ECHO=`which echo`
+
+#
 # Print Header
 #
-echo ""
-echo "*****************"
-echo "* Test cscripts *"
-echo "*****************"
+$ECHO ""
+$ECHO "*****************"
+$ECHO "* Test cscripts *"
+$ECHO "*****************"
 
 
 #
@@ -44,7 +49,7 @@ export PFILES=pfiles
 #
 # Test cspull
 # ===========
-echo -n "Test cspull: "
+$ECHO -n "Test cspull: "
 chmod +x @abs_top_srcdir@/scripts/cspull.py
 @abs_top_srcdir@/scripts/cspull.py \
   srcmdl="data/crab.xml" \
@@ -62,15 +67,15 @@ chmod +x @abs_top_srcdir@/scripts/cspull.py
   rad=5.0 \
   npix=200 \
   binsz=0.05 > cspull.log
-echo -n "."
+$ECHO -n "."
 if [ -s "pull.dat" ]
 then
-  echo -n "."
+  $ECHO -n "."
 else
-  echo " pull.dat file is not valid"
+  $ECHO " pull.dat file is not valid"
   exit 1
 fi
-echo " ok"
+$ECHO " ok"
 
 
 #
@@ -100,7 +105,7 @@ echo " ok"
 #
 # Test cstsdist
 # =============
-echo -n "Test cstsdist: "
+$ECHO -n "Test cstsdist: "
 chmod +x @abs_top_srcdir@/scripts/cstsdist.py
 @abs_top_srcdir@/scripts/cstsdist.py \
   outfile="ts.dat" \
@@ -117,12 +122,12 @@ chmod +x @abs_top_srcdir@/scripts/cstsdist.py
   rad=5.0 \
   npix=200 \
   binsz=0.05 > cstsdist.log
-echo -n "."
+$ECHO -n "."
 if [ -s "ts.dat" ]
 then
-  echo -n "."
+  $ECHO -n "."
 else
-  echo " ts.dat file is not valid"
+  $ECHO " ts.dat file is not valid"
   exit 1
 fi
-echo " ok"
+$ECHO " ok"
diff --git a/test/test_ctools.sh b/test/test_ctools.sh
index 99e59a1..c35058a 100755
--- a/test/test_ctools.sh
+++ b/test/test_ctools.sh
@@ -2,7 +2,7 @@
 # ==========================================================================
 # This script tests all ctools
 #
-# Copyright (C) 2011-2012 Jurgen Knodlseder
+# Copyright (C) 2011-2012 Juergen Knoedlseder
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -20,11 +20,16 @@
 # ==========================================================================
 
 #
+# Get echo command (to circumvent built-in echo on some systems)
+#
+ECHO=`which echo`
+
+#
 # Print Header
 #
-echo "***************"
-echo "* Test ctools *"
-echo "***************"
+$ECHO "***************"
+$ECHO "* Test ctools *"
+$ECHO "***************"
 
 #
 # Define executables
@@ -54,7 +59,7 @@ export PFILES=pfiles
 #
 # Test ctobssim
 # =============
-echo -n "Test ctobssim: "
+$ECHO -n "Test ctobssim: "
 $ctobssim infile="data/crab.xml" \
           outfile="events.fits" \
           caldb="irf" \
@@ -66,21 +71,21 @@ $ctobssim infile="data/crab.xml" \
           tmax=1800.0 \
           emin=0.1 \
           emax=100.0
-echo -n "."
+$ECHO -n "."
 if [ -s "events.fits" ]
 then
-  echo -n "."
+  $ECHO -n "."
 else
   echo " events.fits file is not valid"
   exit 1
 fi
-echo " ok"
+$ECHO " ok"
 
 
 #
 # Test ctskymap
 # =============
-echo -n "Test ctskymap: "
+$ECHO -n "Test ctskymap: "
 $ctskymap evfile="events.fits" \
           outfile="skymap.fits" \
           emin=0.1 \
@@ -92,21 +97,21 @@ $ctskymap evfile="events.fits" \
           xref=83.63 \
           yref=22.01 \
           proj="CAR"
-echo -n "."
+$ECHO -n "."
 if [ -s "skymap.fits" ]
 then
-  echo -n "."
+  $ECHO -n "."
 else
-  echo " skymap.fits file is not valid"
+  $ECHO " skymap.fits file is not valid"
   exit 1
 fi
-echo " ok"
+$ECHO " ok"
 
 
 #
 # Test ctbin
 # ==========
-echo -n "Test ctbin: "
+$ECHO -n "Test ctbin: "
 $ctbin evfile="events.fits" \
        outfile="cntmap.fits" \
        emin=0.1 \
@@ -119,21 +124,21 @@ $ctbin evfile="events.fits" \
        xref=83.63 \
        yref=22.01 \
        proj="CAR"
-echo -n "."
+$ECHO -n "."
 if [ -s "cntmap.fits" ]
 then
-  echo -n "."
+  $ECHO -n "."
 else
-  echo " cntmap.fits file is not valid"
+  $ECHO " cntmap.fits file is not valid"
   exit 1
 fi
-echo " ok"
+$ECHO " ok"
 
 
 #
 # Test ctselect
 # =============
-echo -n "Test ctselect: "
+$ECHO -n "Test ctselect: "
 $ctselect infile="events.fits" \
           outfile="selected_events.fits" \
           ra=83.63 \
@@ -143,32 +148,32 @@ $ctselect infile="events.fits" \
           tmax=1800.0 \
           emin=0.1 \
           emax=100.0
-echo -n "."
+$ECHO -n "."
 if [ -s "selected_events.fits" ]
 then
-  echo -n "."
+  $ECHO -n "."
 else
-  echo " selected_events.fits file is not valid"
+  $ECHO " selected_events.fits file is not valid"
   exit 1
 fi
-echo " ok"
+$ECHO " ok"
 
 
 #
 # Test ctlike
 # ===========
-echo -n "Test ctlike: "
+$ECHO -n "Test ctlike: "
 $ctlike infile="cntmap.fits" \
         srcmdl="data/crab.xml" \
         outmdl="results_binned.xml" \
         caldb="irf" \
         irf="kb_E_50h_v3"
-echo -n "."
+$ECHO -n "."
 if [ -s "results_binned.xml" ]
 then
-  echo -n "."
+  $ECHO -n "."
 else
-  echo " results_binned.xml file is not valid"
+  $ECHO " results_binned.xml file is not valid"
   exit 1
 fi
 $ctlike infile="selected_events.fits" \
@@ -176,12 +181,12 @@ $ctlike infile="selected_events.fits" \
         outmdl="results_unbinned.xml" \
         caldb="irf" \
         irf="kb_E_50h_v3"
-echo -n "."
+$ECHO -n "."
 if [ -s "results_unbinned.xml" ]
 then
-  echo -n "."
+  $ECHO -n "."
 else
-  echo " results_unbinned.xml file is not valid"
+  $ECHO " results_unbinned.xml file is not valid"
   exit 1
 fi
-echo " ok"
+$ECHO " ok"
--
libgit2 0.21.4