Fix paths to match updated concolic directory layout

Former-commit-id: 0cc5e247314558bf78f466927989b7cdc71d4db7

tools/do_concolic.sh

@@ -16,7 +16,7 @@ whoami=`whoami`
 # simple error checking
 # 
 if [ $GRACE_HOME"X" = "X" ]; then echo Failed to set GRACE_HOME; exit 2; fi
-if [ ! -f $GRACE_HOME/concolic/src/util/linux/objdump_to_grace ]; then  
+if [ ! -f $GRACE_HOME/concolic/scripts/objdump_to_grace ]; then  
 	echo "Failed to set GRACE_HOME properly (i.e. wrong path)"
 	exit 3 
 fi
@@ -31,15 +31,15 @@ line=`cat $annot|egrep " FUNC GLOBAL exit"|sed "s/  */ /g"`
 stop_ea=`echo $line |cut -d" " -f1`
 
 # assume grace_home env is set.
-$GRACE_HOME/concolic/src/util/linux/objdump_to_grace $strata_exe
+$GRACE_HOME/concolic/scripts/objdump_to_grace $strata_exe
 if [ ! -f $sym ]; then
 	echo Failed to produce .sym file
 	exit 1;
 fi
 
 
-echo STRATA_GRACE=1 $GRACE_HOME/concolic/bin/pgrp-timeout $GRACE_TIMEOUT_VALUE $GRACE_HOME/concolic/src/util/linux/run $extra_args  -s $sym $strata_exe
-     STRATA_GRACE=1 $GRACE_HOME/concolic/bin/pgrp-timeout $GRACE_TIMEOUT_VALUE $GRACE_HOME/concolic/src/util/linux/run $extra_args  -s $sym $strata_exe
+echo STRATA_GRACE=1 $GRACE_HOME/concolic/bin/pgrp-timeout $GRACE_TIMEOUT_VALUE $GRACE_HOME/concolic/bin/run $extra_args  -s $sym $strata_exe
+     STRATA_GRACE=1 $GRACE_HOME/concolic/bin/pgrp-timeout $GRACE_TIMEOUT_VALUE $GRACE_HOME/concolic/bin/run $extra_args  -s $sym $strata_exe