fix(ci): always unwind pushd in run_conditional_tests.sh#7304
Open
akgitrepos wants to merge 1 commit intogoogleapis:mainfrom
Open
fix(ci): always unwind pushd in run_conditional_tests.sh#7304akgitrepos wants to merge 1 commit intogoogleapis:mainfrom
akgitrepos wants to merge 1 commit intogoogleapis:mainfrom
Conversation
Author
|
@pearigee Made some quick fix to run_conditional_tests.sh. Would appreciate a review. Thank you! |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
ci/run_conditional_tests.shwhere a failing package test exited the loop beforepopd, leaving the shell in a pushed directoryRETVAL+break) while guaranteeing directory stack cleanupEXIT,INT,TERM) also unwind an outstandingpushdRoot Cause
Inside the test loop, the script did:
pushd ${d}retif [ ${ret} -ne 0 ]; then ... break; fipopdWhen
ret != 0,breakwas taken beforepopd, so cleanup was skipped.What Changed
IN_PUSHED_DIRflagcleanup_pushd()that conditionally performspopd > /dev/null || truetrap cleanup_pushd EXIT INT TERMIN_PUSHED_DIR=trueimmediately afterpushdpopdbefore failurebreak, then resetIN_PUSHED_DIR=falseWhy This Is Safe
pushdis currently activepopdremains in normal flow; trap is fallback for abnormal exitsValidation
bash -n ci/run_conditional_tests.shbash -n ci/run_single_test.shRisk Assessment
Low risk. Change is localized to directory-stack cleanup and does not alter core CI decision logic.