diff --git a/tools/do_p1transform.sh b/tools/do_p1transform.sh index 3f4d593268832013a94223603c8fd2e71cc9c3ee..aee01a5a7a66cfda50094fcb92dc56d22772615e 100755 --- a/tools/do_p1transform.sh +++ b/tools/do_p1transform.sh @@ -278,14 +278,15 @@ $SECURITY_TRANSFORMS_HOME/tools/cover/cover $CLONE_ID $EXECUTED_ADDRESSES_FINAL touch $COVERAGE_FILE -command="$PEASOUP_HOME/tools/my_timeout.sh $TIMEOUT_VALUE $PN_BINARY --variant_id=$CLONE_ID --bed_script=$BED_SCRIPT \ +c1="$PEASOUP_HOME/tools/my_timeout.sh $TIMEOUT_VALUE " +c2="$PN_BINARY --variant_id=$CLONE_ID --bed_script=$BED_SCRIPT \ --coverage_file=$COVERAGE_FILE --pn_threshold=$P1THRESHOLD \ --canaries=$DO_CANARIES --blacklist=$LIBC_FILTER --shared_object_protection --no_p1_validate --align_stack" if [ ! -z $DEBUG_P1 ]; then - gdb --args $command + gdb --args $c2 else - $command + $c1 $c2 fi diff --git a/tools/ps_analyze.sh b/tools/ps_analyze.sh index d2753c83738b2a11fbd0304b4f11fff0b393a9fa..c421fb96956c22e56f249bcde53db4ea82167f8f 100755 --- a/tools/ps_analyze.sh +++ b/tools/ps_analyze.sh @@ -401,7 +401,8 @@ perform_step() if [[ "$mandatory" != "none" && "$mandatory" != "mandatory" ]]; then check_dependencies $mandatory if [ $? -eq 0 ]; then - echo Skipping step $step because of failed dependencies. [dependencies=$mandatory] + echo Skipping step $step because of failed dependencies. [dependencies=$mandatory] "*************************************************" + errors=1 if [ $record_stats -eq 1 ]; then $PEASOUP_HOME/tools/db/job_status_report.sh "$JOBID" "$step" "$stepnum" completed "$starttime" error fi