Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

tools/mixin/bin/test-all - Fix guard for EXT_DIR #22204

Merged
merged 1 commit into from
Dec 2, 2021
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions tools/mixin/bin/test-all
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@ function absdirname() {
}

SCRIPT_DIR=$(absdirname "$0")
EXT_DIR=$(cv path -c extensionsDir)/example-mixin
EXT_DIR=$(cv path -c extensionsDir)
EX_EXT_DIR="$EXT_DIR/example-mixin"
JUNIT_DIR="$1"

## TODO: Once the managed-entity regression is examined/fixed, remove the MY_MIXINS list. Then it will test all mixins.
Expand All @@ -34,7 +35,7 @@ function mixer_test() {
cv flush

## usage: mixer test [-f] [--bare] [--isolate] <temp-ext-path> [<mixin-names>...] -- [<phpunit-options>...]
"$SCRIPT_DIR/mixer" test -f "$EXT_DIR" "$@" -- --group e2e --log-junit "$JUNIT_DIR/$XML_FILE"
"$SCRIPT_DIR/mixer" test -f "$EX_EXT_DIR" "$@" -- --group e2e --log-junit "$JUNIT_DIR/$XML_FILE"
}

###############################################################################
Expand Down