[CI] unify PDK root and fix argument passing
diff --git a/.travis.yml b/.travis.yml index be1e0f6..ce535ca 100644 --- a/.travis.yml +++ b/.travis.yml
@@ -83,8 +83,8 @@ - sh .travisCI/precheck/precheckBuild.sh 1 - bash .travisCI/utils/bash_run_wrapper.sh .travisCI/openlane_build/build_openlane.sh script: - - bash .travisCI/utils/bash_run_wrapper.sh .travisCI/openlane_build/run_macro.sh user_proj_example - - bash .travisCI/utils/bash_run_wrapper.sh .travisCI/openlane_build/run_macro.sh user_project_wrapper + - bash .travisCI/openlane_build/run_macro.sh user_proj_example + - bash .travisCI/openlane_build/run_macro.sh user_project_wrapper - bash .travisCI/utils/bash_run_wrapper.sh .travisCI/openlane_build/run_make_ship.sh - bash .travisCI/precheck/run-precheck.sh allow_failures: @@ -94,7 +94,7 @@ - sh .travisCI/precheck/precheckBuild.sh 1 - bash .travisCI/utils/bash_run_wrapper.sh .travisCI/openlane_build/build_openlane.sh script: - - bash .travisCI/utils/bash_run_wrapper.sh .travisCI/openlane_build/run_macro.sh user_proj_example - - bash .travisCI/utils/bash_run_wrapper.sh .travisCI/openlane_build/run_macro.sh user_project_wrapper + - bash .travisCI/openlane_build/run_macro.sh user_proj_example + - bash .travisCI/openlane_build/run_macro.sh user_project_wrapper - bash .travisCI/utils/bash_run_wrapper.sh .travisCI/openlane_build/run_make_ship.sh - bash .travisCI/precheck/run-precheck.sh
diff --git a/.travisCI/openlane_build/build_openlane.sh b/.travisCI/openlane_build/build_openlane.sh index 7477bd3..cbd4edd 100644 --- a/.travisCI/openlane_build/build_openlane.sh +++ b/.travisCI/openlane_build/build_openlane.sh
@@ -15,6 +15,7 @@ # SPDX-License-Identifier: Apache-2.0 export OPENLANE_ROOT=$(pwd)/../openlane +export PDK_ROOT=$(pwd)/../pdks export OPENLANE_TAG=staging cd openlane make openlane
diff --git a/.travisCI/openlane_build/run_macro.sh b/.travisCI/openlane_build/run_macro.sh index d0656f2..c672188 100644 --- a/.travisCI/openlane_build/run_macro.sh +++ b/.travisCI/openlane_build/run_macro.sh
@@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. # SPDX-License-Identifier: Apache-2.0 - +export RUN_WRAPPER=$(pwd)/.travisCI/utils/run_wrapper.sh export OPENLANE_TAG=staging export PDK_ROOT=$(pwd)/../pdks export OPENLANE_ROOT=$(pwd)/../openlane @@ -21,7 +21,8 @@ export logFile=$TARGET_MACRO.run.log make uncompress cd openlane -make $TARGET_MACRO 2>&1 | tee $logFile + +bash $RUN_WRAPPER "make $TARGET_MACRO" 2>&1 | tee $logFile cnt=$(grep -c "Flow Completed Without Fatal Errors" $logFile) if ! [[ $cnt ]]; then cnt=0; fi
diff --git a/.travisCI/precheck/precheckBuild.sh b/.travisCI/precheck/precheckBuild.sh index e05987b..cc84167 100644 --- a/.travisCI/precheck/precheckBuild.sh +++ b/.travisCI/precheck/precheckBuild.sh
@@ -15,7 +15,7 @@ # SPDX-License-Identifier: Apache-2.0 # By default build pdk since we don't need the other script for the main purpose -export SKIP_PDK_BUILD=${2:-0} +export SKIP_PDK_BUILD=${1:-0} export TARGET_PATH=$(pwd) git clone https://github.com/efabless/open_mpw_precheck.git
diff --git a/.travisCI/utils/pdkBuild.sh b/.travisCI/utils/pdkBuild.sh index 38fb7b7..f58f58c 100644 --- a/.travisCI/utils/pdkBuild.sh +++ b/.travisCI/utils/pdkBuild.sh
@@ -17,7 +17,7 @@ # By default skip timing since we don't need the libs in any of the CI tests -export SKIP_TIMING=${2:-1} +export SKIP_TIMING=${1:-1} docker pull efabless/openlane:staging