Skip to content

Commit 90f49c1

Browse files
authored
Merge pull request #3870 from The-OpenROAD-Project-staging/test-fix-issue-platform-paths
fix: make path conversion scalable and fix issue paths
2 parents 97aecfe + 024c568 commit 90f49c1

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

flow/util/generate-vars.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,9 @@ while read -r VAR; do
5151
if [[ "${name}" == *"SCRIPTS_DIR"* ]]; then
5252
value=$(sed -e "s,${FLOW_ROOT},.,g" <<< "${value}")
5353
fi
54+
for path in workspace platforms; do
55+
value=$(sed -e "s,\(^\|[: \"']\)/${path},\1./${path},g" <<< "${value}")
56+
done
5457
value=$(sed -e "s,${FLOW_ROOT},\${FLOW_HOME},g" <<< "${value}")
5558
value=$(sed -e "s,${ORFS_ROOT},\${FLOW_HOME}/\.\.,g" <<< "${value}")
5659

flow/util/makeIssue.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -77,9 +77,9 @@ cat > ${RUN_ME_SCRIPT} <<EOF
7777
#!/usr/bin/env bash
7878
source ${VARS_BASENAME}.sh
7979
if [[ ! -z \${GDB+x} ]]; then
80-
gdb --args openroad -no_init \${SCRIPTS_DIR}/${ISSUE_TARGET}.tcl
80+
gdb --args openroad -no_init -threads ${NUM_CORES:-1} \${SCRIPTS_DIR}/${ISSUE_TARGET}.tcl
8181
else
82-
openroad -no_init \${SCRIPTS_DIR}/${ISSUE_TARGET}.tcl
82+
openroad -no_init -threads ${NUM_CORES:-1} \${SCRIPTS_DIR}/${ISSUE_TARGET}.tcl
8383
fi
8484
EOF
8585
chmod +x ${RUN_ME_SCRIPT}
@@ -103,7 +103,7 @@ echo "Using $COMPRESS to compress tar file"
103103
if [ -v FULL_ISSUE ]; then
104104
DESIGN_PLATFORM_FILES="$DESIGN_DIR $PLATFORM_DIR"
105105
else
106-
DESIGN_PLATFORM_FILES="$DESIGN_CONFIG $PLATFORM_DIR/config.mk"
106+
DESIGN_PLATFORM_FILES="$DESIGN_CONFIG $PLATFORM_DIR/config*.mk"
107107
fi
108108

109109
tar --use-compress-program=${COMPRESS} \

0 commit comments

Comments
 (0)