From ea234ded22739fbf671dc623754f0a8f399948e4 Mon Sep 17 00:00:00 2001
From: jdh8d <jdh8d@git.zephyr-software.com>
Date: Fri, 24 Oct 2014 20:18:52 +0000
Subject: [PATCH] Updates to support DEBUG_p1 option, and make
 force-skipped-steps more obvious in ps_analyze.

Former-commit-id: 5649cd6c4673254ee86ef458b98ad96a2e877e21
---
 tools/do_p1transform.sh | 7 ++++---
 tools/ps_analyze.sh     | 3 ++-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/tools/do_p1transform.sh b/tools/do_p1transform.sh
index 3f4d59326..aee01a5a7 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 d2753c837..c421fb969 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
-- 
GitLab