From 89a316ad1ab6629f981737bfe228c78d60c639cf Mon Sep 17 00:00:00 2001
From: jdh8d <jdh8d@git.zephyr-software.com>
Date: Fri, 23 Oct 2015 15:37:23 +0000
Subject: [PATCH] Updates to support --step-option better (spaces in a quoted
option)
Former-commit-id: d38366ac7fd900f0e43cb2dd2058939c02bec4d1
---
tools/cfar.sh | 7 ++++---
tools/ps_analyze.sh | 4 ++--
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/tools/cfar.sh b/tools/cfar.sh
index 1036c5f64..5572ea122 100755
--- a/tools/cfar.sh
+++ b/tools/cfar.sh
@@ -31,10 +31,11 @@ do
sharepath_key="$seq:$variants:dir://$share_path "
# optoins for zipr's large_only plugin to help create non-overlapping code segments.
- large_only_options="--step-option zipr:--large_only:on --step-option zipr:true --step-option zipr:--large_only:variant --step-option zipr:$sharepath_key"
+ #large_only_options="--step-option zipr:--large_only:on --step-option zipr:true --step-option zipr:--large_only:variant --step-option zipr:$sharepath_key"
+ large_only_options="--step-option zipr:'--large_only:on true --large_only:variant $sharepath_key'"
- # optoins to p1 to create non-overlapping canary values.
- p1options=" --step-option p1transform:--canary_value --step-option p1transform:0xFF0${seq}${seq}0FF --step-option p1transform:--random_seed --step-option p1transform:$anyseed "
+ # options to p1 to create non-overlapping canary values.
+ p1options=" --step-option p1transform:'--canary_value 0xFF0${seq}${seq}0FF --random_seed $anyseed'"
# invoke $PS.
cmd=" PGDATABASE=peasoup_${USER}_v$seq $zipr_env $PEASOUP_HOME/tools/ps_analyze.sh $in $out.v$seq $@ $p1options $large_only_options > variant_output.$seq 2>&1 &"
diff --git a/tools/ps_analyze.sh b/tools/ps_analyze.sh
index 3363ddcd6..9e1844222 100755
--- a/tools/ps_analyze.sh
+++ b/tools/ps_analyze.sh
@@ -241,7 +241,7 @@ check_options()
shift 2
;;
-o|--step-option)
- set_step_option $2
+ set_step_option "$2"
shift 2
;;
# This is the watchdog value
@@ -692,7 +692,7 @@ shift
#
# finish argument parsing
#
-check_options $*
+check_options "$@"
#
--
GitLab